Revision 33050118
ID | 33050118f7cb91cce9b5290b27050c71a1dfa7bd |
Merge branch 'origin/devel-0.13' into quota
Conflicts:
snf-cyclades-app/synnefo/api/servers.py
Files
- added
- modified
- copied
- renamed
- deleted
ID | 33050118f7cb91cce9b5290b27050c71a1dfa7bd |
Added by Georgios D. Tsoukalas over 10 years ago
Merge branch 'origin/devel-0.13' into quota
Conflicts:
snf-cyclades-app/synnefo/api/servers.py