Revision 48f363ce
ID | 48f363cebc0cc3d8eeac65be3a3b41dc4bc40580 |
Parent | b9b36fff, bb3aa069 |
Child | 3a00d1d4 |
Merge branch 'master' into feature-1004
Conflicts:
install.sh
src/sunstone/etc/sunstone-server.conf
src/sunstone/public/js/plugins/hosts-tab.js
src/sunstone/public/js/plugins/vnets-tab.js
I have updated the vnets plugin to include missing translations.
Files
- added
- modified
- copied
- renamed
- deleted