Brian Federle 9334dab7f7 Merge branch 'master' into ui-ucs ... Conflicts: ui/scripts/system.js		2013-07-09 13:38:22 -07:00
..
css	Merge branch 'master' into ui-ucs	2013-07-09 13:38:22 -07:00
images	Merge branch 'master' into ui-ucs	2013-07-09 13:38:22 -07:00
lib	Add plugin loading functionality and basic framework	2012-12-19 15:47:25 -08:00
modules	CLOUDSTACK-3337: Don't show current ACL list in dropdown	2013-07-08 15:53:14 -07:00
plugins	rat: Fix license for file from recent ui-plugins merge	2013-02-14 17:18:22 +05:30
scripts	Merge branch 'master' into ui-ucs	2013-07-09 13:38:22 -07:00
tests	License header updates for the UI folder	2012-08-03 12:45:47 -04:00
dictionary.jsp	UI: Localize app name and 'about' window	2013-07-02 11:59:20 -07:00
index.jsp	Remove zone filter drop-down	2013-06-14 12:26:00 -07:00