« Previous | Next » 

Revision f770d29f

IDf770d29fd6d9cbdfca1d4d4bbff6a1a0b763689a

Added by Kostas Papadimitriou about 8 years ago

Merge branch 'release-0.13' into develop

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted