« Previous | Next » 

Revision f0001470

IDf0001470dd78e92a51090d966275e64f84d381fd

Added by Christos Stavrakakis about 8 years ago

Merge branch 'feature-snf-django' into develop

Conflicts:
docs/older/Changelog.pithos-app
snf-astakos-app/astakos/im/api/__init__.py
snf-pithos-app/pithos/api/util.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted