Revision 80a548e3
| ID | 80a548e390c6b1308a4c660c95888340ff0c3848 |
Merge branch 'master' into develop
Conflicts:
Changelog
astakosclient/astakosclient/keypath.py
ci/utils.py
docs/admin-guide.rst
snf-astakos-app/astakos/im/cookie.py
snf-astakos-app/astakos/im/functions.py
snf-astakos-app/astakos/im/quotas.py
snf-astakos-app/astakos/im/views/projects.py
snf-astakos-app/astakos/im/views/util.py
snf-cyclades-app/synnefo/api/servers.py
snf-cyclades-app/synnefo/api/tests/servers.py
snf-deploy/snfdeploy/__init__.py
snf-pithos-backend/pithos/backends/lib/sqlite/public.py
version
Files
- added
- modified
- copied
- renamed
- deleted