Brian Federle 500c798f75 Merge branch 'master' into ui-restyle ... Conflicts: client/WEB-INF/classes/resources/messages.properties ui/dictionary.jsp		2013-10-24 11:22:05 -07:00
..
css	CLOUDSTACK-4505: add ExpungeVM command to expunge a destroyed VM on demand	2013-10-24 11:52:00 +02:00
fonts/Noto_Sans	Add custom font for all UI text	2013-09-24 14:18:02 -07:00
images	UI: Add initial UCS section to infrastructure page	2013-07-09 13:48:48 -07:00
lib	Add plugin loading functionality and basic framework	2012-12-19 15:47:25 -08:00
modules	Fix VPC chart layout to support new layout	2013-10-15 14:08:18 -07:00
plugins	Remove file added by accident in previous commit.	2013-09-30 10:08:16 -07:00
scripts	Merge branch 'master' into ui-restyle	2013-10-24 11:22:05 -07:00
stylesheets	Style detail multi-group	2013-10-16 16:02:06 -07:00
tests	License header updates for the UI folder	2012-08-03 12:45:47 -04:00
dictionary.jsp	Merge branch 'master' into ui-restyle	2013-10-24 11:22:05 -07:00
index.jsp	Merge branch 'master' into ui-restyle	2013-10-24 11:22:05 -07:00