Revision 3bb604eb
ID | 3bb604eb1a611dcf4cdf806ab310849674e9d3e2 |
Parent | 9d5eb7a7, dfdc64d2 |
Child | 28c06e75 |
Merge branch '0.6.4' into dev
Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/views.py
Files
- added
- modified
- copied
- renamed
- deleted