Revision 460b907d
ID | 460b907d25f6d9c292fb8c33506d31f616e80bef |
Merge branch 'develop' into feature-projects-ux
Conflicts:
snf-astakos-app/astakos/im/templates/im/projects/intro.html
snf-astakos-app/astakos/im/templatetags/astakos_tags.py
snf-astakos-app/astakos/im/urls.py
snf-astakos-app/astakos/im/views.py
Files
- added
- modified
- copied
- renamed
- deleted