Revision 036600bc
ID | 036600bc74200f9b75c49ce57e77818e7cc4e582 |
Parent | d9ce25b0, 367f863a |
Child | c544a35b |
Merge branch 'feature-3264'
Conflicts:
src/sunstone/public/js/plugins/templates-tab.js
src/vmm_mad/remotes/vcenter/vcenter_driver.rb
Files
- added
- modified
- copied
- renamed
- deleted