Ingo Schommer 6ee0d53f40 Fixed merge error (mainly new translation entity format in templates) ... Merge error from 2a35f2f928, which was then further regressed by Sam running the text collector on those faulty templates: 750b5b4079		2013-08-09 15:27:28 +02:00
..
BackLink_Button.ss	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-08-07 17:14:47 +02:00
CMSLoadingScreen.ss	Translations: Switch to Transifex format	2013-08-07 00:25:16 +02:00
CMSSectionIcon.ss	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12:00
CMSSettingsController_SilverStripeNavigator.ss	ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change.	2012-10-05 16:30:47 +13:00
Editor_toolbar.ss	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12:00
LeftAndMain_Content.ss	UNFINISHED Processing multiple PJAX responses on CMS JavaScript, introducing data-pjax-fragment attribute to identify reloadable template parts	2012-05-30 15:07:13 +02:00
LeftAndMain_EditForm.ss	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12:00
LeftAndMain_Menu.ss	Fixed merge error (mainly new translation entity format in templates)	2013-08-09 15:27:28 +02:00
LeftAndMain_SilverStripeNavigator.ss	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12:00
ModelAdmin_Content.ss	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12:00
ModelAdmin_EditForm.ss	MINOR Removing executable flag from all files (thanks miiihi)	2011-09-18 22:04:02 +02:00
ModelAdmin_ImportSpec.ss	Fixed merge error (mainly new translation entity format in templates)	2013-08-09 15:27:28 +02:00
ModelAdmin_Tools.ss	Fixed merge error (mainly new translation entity format in templates)	2013-08-09 15:27:28 +02:00