Revision 8c165b27
ID | 8c165b27cb2b2118ebd83e69d0f729ed890d98d5 |
Merge branch 'devel-0.13' into latest-quota
Conflicts:
snf-cyclades-app/synnefo/api/servers.py
snf-cyclades-app/synnefo/logic/backend.py
Files
- added
- modified
- copied
- renamed
- deleted