Revision f617f8af
ID | f617f8af98500a0199d7963c3e5021502427d961 |
Parent | 21b3ac28, 60c3d6d2 |
Child | b9fad4fd |
Merge branch 'novnc_init' of https://github.com/bechtoldt/one into feature-2862
Conflicts:
share/pkgs/Debian/opennebula-sunstone
share/pkgs/Ubuntu/opennebula-sunstone
Files
- added
- modified
- copied
- renamed
- deleted