« Previous | Next » 

Revision c09cb651

IDc09cb651c884578c38f9266a7a11f1a5abab90c1

Added by Georgios D. Tsoukalas about 8 years ago

Merge branch 'release-0.14' into develop

Conflicts:
snf-astakos-app/astakos/im/messages.py
snf-astakos-app/astakos/im/settings.py
version

Files

  • added
  • modified
  • copied
  • renamed
  • deleted