Revision 8893a747
ID | 8893a747d952af53a81dbe8f740ff312d3dbfbd7 |
Merge branch 'feature-uinext-ember' of https://code.grnet.gr/git/synnefo into feature-uinext-ember
Conflicts:
snf-cyclades-app/synnefo/ui/new_ui/ui/app/controllers/vm.js
Files
- added
- modified
- copied
- renamed
- deleted