« Previous | Next » 

Revision d1a767f7

IDd1a767f79504b98b4d64656469ae75cd01cc8f55
Parent 509d894e, 26087fb9
Child 7bb6bd0e

Added by Olga Brani over 9 years ago

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Conflicts:
snf-astakos-app/astakos/im/templates/im/astakosgroup_form.html
snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html.BACKUP.21131.html

Files

  • added
  • modified
  • copied
  • renamed
  • deleted