« Previous | Next » 

Revision 6c037281

ID6c03728151de4b707d24135b22102ab25f0c0b72

Added by Olga Brani about 11 years ago

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/api/__init__.py
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html

Files

  • added
  • modified
  • copied
  • renamed
  • deleted