Revision d0e8984d
| ID | d0e8984d739b16b6ce9a6ec936a65d726ed5eaca |
Merge branch 'devel-0.12' into devel-0.13
Conflicts:
snf-cyclades-app/synnefo/plankton/backend.py
Files
- added
- modified
- copied
- renamed
- deleted
| ID | d0e8984d739b16b6ce9a6ec936a65d726ed5eaca |
Added by Christos Stavrakakis almost 11 years ago
Merge branch 'devel-0.12' into devel-0.13
Conflicts:
snf-cyclades-app/synnefo/plankton/backend.py