Revision c9015cf6
ID | c9015cf619f72c01a92117b9d4775afc256da2d1 |
Parent | 51945a9e, 9eafaa32 |
Child | 133b2afe, 54b86775 |
Merge branch 'dev' into 0.6.4
Conflicts:
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
Files
- added
- modified
- copied
- renamed
- deleted