Revision 8cc49f4d
| ID | 8cc49f4d215f1d24c92dbfec8f2916ce856c5b00 |
| Parent | 574264f8, b03877be |
| Child | 9d5eb7a7 |
Merge remote-tracking branch 'origin' into dev
Conflicts:
snf-astakos-app/Changelog
snf-astakos-app/README
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/functions.py
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
snf-astakos-app/astakos/im/static/im/css/modules.css
snf-astakos-app/astakos/im/static/im/js/common.js
snf-astakos-app/astakos/im/templates/im/base.html
snf-astakos-app/astakos/im/views.py
snf-astakos-app/conf/20-snf-astakos-app-settings.conf
Files
- added
- modified
- copied
- renamed
- deleted