-
Christos Stavrakakis authored
Conflicts: snf-cyclades-app/synnefo/api/management/commands/server-inspect.py snf-cyclades-app/synnefo/app_settings/urls.py snf-cyclades-app/synnefo/logic/backend.py snf-cyclades-app/synnefo/logic/backend_allocator.py snf-cyclades-app/synnefo/logic/management/commands/network-inspect.py snf-cyclades-app/synnefo/logic/tests/servers.py snf-cyclades-app/synnefo/quotas/util.py snf-cyclades-app/synnefo/ui/views.py snf-deploy/snfdeploy/__init__.py
9b2c91ac