Synnefo

Revision 52f72710

ID	52f727102d53f678b9b9abd3ca99dbdf57fc00f8

Added by Georgios D. Tsoukalas almost 11 years ago

Merge branch 'develop' into feature-reconfigure-settings

Conflicts:
snf-astakos-app/astakos/im/tests/api.py
snf-astakos-app/astakos/urls.py
snf-cyclades-app/synnefo/api/test/servers.py
snf-cyclades-app/synnefo/api/tests/networks.py
snf-cyclades-app/synnefo/app_settings/urls.py
snf-cyclades-app/synnefo/cyclades_settings.py
snf-django-lib/snf_django/lib/api/utils.py

Files

• added
• modified
• copied
• renamed
• deleted