Revision 85d91035
| ID | 85d91035ff0e8824a83cd70c40fd7d83d6495309 |
Merge branch 'develop' into feature-volume-snapshots
Conflicts:
snf-cyclades-app/synnefo/plankton/views.py
Files
- added
- modified
- copied
- renamed
- deleted
| ID | 85d91035ff0e8824a83cd70c40fd7d83d6495309 |
Added by Christos Stavrakakis over 10 years ago
Merge branch 'develop' into feature-volume-snapshots
Conflicts:
snf-cyclades-app/synnefo/plankton/views.py