Revision ce264c16
| ID | ce264c16c2615330254eeb0f8f0e92110a873374 |
Merge branch 'hotfix-0.14.2' into develop
Conflicts:
snf-astakos-app/astakos/im/views/projects.py
snf-cyclades-app/synnefo/logic/backend.py
snf-django-lib/snf_django/lib/astakos.py
version
Files
- added
- modified
- copied
- renamed
- deleted