« Previous | Next » 

Revision ed2064f8

IDed2064f8fbecc936cb03451306646243dde2c291

Added by Christos Stavrakakis almost 8 years ago

Merge branch 'hotfix-0.14.6' into develop

Conflicts:
Changelog
docs/admin-guide.rst
snf-cyclades-app/synnefo/api/management/commands/network-remove.py
snf-cyclades-app/synnefo/api/servers.py
snf-cyclades-app/synnefo/api/tests/servers.py
snf-cyclades-app/synnefo/logic/backend.py
snf-cyclades-app/synnefo/logic/tests/callbacks.py
snf-cyclades-app/synnefo/quotas/__init__.py
snf-django-lib/snf_django/lib/api/__init__.py
snf-pithos-app/pithos/api/manage_accounts/__init__.py
snf-pithos-backend/pithos/backends/modular.py
version

Files

  • added
  • modified
  • copied
  • renamed
  • deleted