Damian Mooyman 7d9ca4fac5 Merge 3.3 into 3 ... # Conflicts: # javascript/lang/src/ar.js # javascript/lang/src/cs.js # javascript/lang/src/de.js # javascript/lang/src/en.js # javascript/lang/src/eo.js # javascript/lang/src/es.js # javascript/lang/src/fa_IR.js # javascript/lang/src/fr.js # javascript/lang/src/hu.js # javascript/lang/src/id.js # javascript/lang/src/is.js # javascript/lang/src/it.js # javascript/lang/src/ja.js # javascript/lang/src/ko.js # javascript/lang/src/lt.js # javascript/lang/src/mi.js # javascript/lang/src/nb.js # javascript/lang/src/nl.js # javascript/lang/src/pl.js # javascript/lang/src/ro.js # javascript/lang/src/ru.js # javascript/lang/src/sk.js # javascript/lang/src/sl.js # javascript/lang/src/sr.js # javascript/lang/src/sr_RS@latin.js # javascript/lang/src/sv.js # javascript/lang/src/zh.js		2016-05-11 14:03:59 +12:00
..
lang	Merge 3.3 into 3	2016-05-11 14:03:59 +12:00
AssetAdmin.DragDrop.js	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +13:00
AssetAdmin.js	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +13:00
CMSMain.AddForm.js	Merge remote-tracking branch 'origin/3.3' into 3	2016-01-25 15:58:35 +13:00
CMSMain.EditForm.js	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +13:00
CMSMain.js	Add three column layout to Page content view	2015-07-02 10:23:37 +12:00
CMSMain.Tree.js	Update the filtered tree styling	2015-08-25 13:02:20 +12:00
CMSPageHistoryController.js	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +13:00
RedirectorPage.js	FIX: RedirectorPage toggles not working (fixes #1328)	2015-11-17 16:22:49 +00:00
SilverStripeNavigator.js	NEW Side by side editing functionality - first cut (os#7412)	2012-12-10 18:09:54 +01:00
SiteTreeURLSegmentField.js	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +13:00