Brian Federle eacbb4cb2d Merge branch 'master' into ui-add-remove-nics ... Conflicts: client/WEB-INF/classes/resources/messages.properties ui/dictionary.jsp		2013-04-30 11:57:38 -07:00
..
css	Detail view: fix multi-action styling	2013-04-26 15:15:15 -07:00
images	Update affinity icon	2013-04-25 13:21:15 -07:00
lib	Add plugin loading functionality and basic framework	2012-12-19 15:47:25 -08:00
modules	Add UI 'module' API	2013-04-18 12:52:55 -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-add-remove-nics	2013-04-30 11:57:38 -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-add-remove-nics	2013-04-30 11:57:38 -07:00
index.jsp	Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack	2013-04-29 06:56:51 -04:00