Revision f2e66cdc
ID | f2e66cdc2974af2594282e88b02fc3a061b2aec7 |
Parent | 7201037a, beed4932 |
Child | c8e87b3e, b6d1ba03 |
Merge branch 'sunstone' of opennebula.org:one-ui into sunstone
Conflicts:
src/sunstone/public/js/one-ui_views.js
Files
- added
- modified
- copied
- renamed
- deleted