Revision 3b120cdd
ID | 3b120cddc2b05b2b48aaca7b90d6375b0b3bc213 |
Merge branch 'develop' into debian-develop
Conflicts:
snf-cyclades-app/synnefo/api/management/commands/flavor-create.py
Files
- added
- modified
- copied
- renamed
- deleted
ID | 3b120cddc2b05b2b48aaca7b90d6375b0b3bc213 |
Added by Christos Stavrakakis about 11 years ago
Merge branch 'develop' into debian-develop
Conflicts:
snf-cyclades-app/synnefo/api/management/commands/flavor-create.py