« Previous | Next » 

Revision e8af89d0

IDe8af89d042ec5e955b738070e3b6273f002b3e6b
Parent f3342849, 7ddc8a37
Child 71a38edf

Added by Sofia Papagiannaki over 9 years ago

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

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

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted