Revision 6dbd2075
ID | 6dbd2075d29463a359aea4391d001c37fe7a00c6 |
Merge branch 'master' into new_queues
Conflicts:
snf-cyclades-app/synnefo/logic/callbacks.py
Files
- added
- modified
- copied
- renamed
- deleted
ID | 6dbd2075d29463a359aea4391d001c37fe7a00c6 |
Added by Christos Stavrakakis over 11 years ago
Merge branch 'master' into new_queues
Conflicts:
snf-cyclades-app/synnefo/logic/callbacks.py