« Previous | Next » 

Revision 172ce682

ID172ce682f4893ceb9a6560586129e99bebd39e45

Added by Sofia Papagiannaki over 9 years ago

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

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted