Revision 567ce269
| ID | 567ce2691f1bf3dade38c7f0d7ea8c25d9732f91 |
| Parent | 025b4028, 3abf6c78 |
| Child | aa4109d4, b591d833 |
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/templates/im/astakosgroup_detail.html
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
Files
- added
- modified
- copied
- renamed
- deleted