Revision 680a29ac
ID | 680a29ac725f0a6a76dcc0cd598328cfe1c11bcf |
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
Conflicts:
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
snf-astakos-app/astakos/im/templates/im/profile.html
Files
- added
- modified
- copied
- renamed
- deleted