Merge branch 'feature-507' of opennebula.org:one-ui into feature-507

Browse Source

Conflicts:
	src/sunstone/public/js/plugins/vms-tab.js
	src/sunstone/public/js/plugins/vnets-tab.js

...

This commit is contained in:

Hector Sanjuan 2011-03-25 16:24:16 +01:00

parent d5584f5a71 31274272d8

commit 1e342487be

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available