« Previous | Next » 

Revision d37e4e21

IDd37e4e21f1ee0fcf01ae71a861322b1c3fcdfa86
Parent 23c271b3, 176023aa
Child 672d445a

Added by Sofia Papagiannaki over 9 years ago

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

Conflicts:
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/views.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted