Samuel Georges 2a7dbdd74a Merge branch 'stable' into ui ... Conflicts: modules/cms/classes/CmsObject.php modules/cms/widgets/MediaManager.php		2016-03-25 18:42:13 +11:00
..
backend	Add showSearch option to dropdown	2016-03-25 18:21:58 +11:00
cms	Merge branch 'stable' into ui	2016-03-25 18:42:13 +11:00
system	Merge branch 'stable' into ui	2016-03-25 18:42:13 +11:00