Revision 5f071b6f
ID | 5f071b6fd997ea1536ab3d43b824c5f6dceb2943 |
new ui: merge modifications
Conflicts:
snf-cyclades-app/synnefo/ui/new_ui/ui/javascripts/okeanos-ember.js
snf-cyclades-app/synnefo/ui/new_ui/ui/javascripts/okeanos-ember/components.js
snf-cyclades-app/synnefo/ui/new_ui/ui/javascripts/okeanos-ember/controllers.js
snf-cyclades-app/synnefo/ui/new_ui/ui/javascripts/okeanos-ember/obj.js
snf-cyclades-app/synnefo/ui/new_ui/ui/javascripts/okeanos-ember/views.js
snf-cyclades-app/synnefo/ui/new_ui/ui/javascripts/templates.js
snf-cyclades-app/synnefo/ui/new_ui/ui/javascripts/templates/wizard.hbs
Files
- added
- modified
- copied
- renamed
- deleted