« Previous | Next » 

Revision 680a29ac

ID680a29ac725f0a6a76dcc0cd598328cfe1c11bcf
Parent 792c2f3b, 74836e50
Child f9aea9c8, 632b6458

Added by Olga Brani over 8 years ago

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