« Previous | Next » 

Revision dc59b418

IDdc59b418f9972a6e7c9c430df44f0c7a3bcf8b1e
Parent 5ebebb20, 1dde22bd
Child 12285b4b

Added by Olga Brani about 9 years ago

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

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted