Revision b16db49b
ID | b16db49b267ae9c6c329311f7b2af9285da5854e |
Parent | 630911ee, 2ef10562 |
Child | 805e5b12 |
Merge branch 'devel-0.11' into ui-0.11
Conflicts:
snf-cyclades-app/synnefo/db/models.py
snf-cyclades-app/synnefo/logic/backend.py
snf-cyclades-app/synnefo/ui/static/snf/js/models.js
Files
- added
- modified
- copied
- renamed
- deleted