« Previous | Next » 

Revision 47b77c8b

ID47b77c8b57b1829f4ce18b3d62f00bc11275b049

Added by Sofia Papagiannaki over 8 years ago

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

Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/management/commands/service-add.py
snf-astakos-app/astakos/im/messages.py
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/urls.py
snf-astakos-app/astakos/im/views.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted