Damian Mooyman 48a30909f3 Merge remote-tracking branch 'origin/3.2' into 3 ... # Conflicts: # admin/javascript/LeftAndMain.BatchActions.js # css/UploadField.css # forms/HtmlEditorField.php		2015-12-22 14:07:52 +13:00
..
ArrayData.php	Add codesniffer that ensures indentation is with tabs.	2012-12-12 17:39:34 +13:00
GenericTemplateGlobalProvider.php	FIX Remove instances of lines longer than 120c	2012-09-30 17:18:13 +13:00
Requirements.php	Fix missing media parameter on Requirements::combine_files	2015-05-11 17:30:59 +12:00
SSTemplateParser.php	[ss-2015-021] Fix rewrite hash links XSS	2015-11-11 16:52:53 +13:00
SSTemplateParser.php.inc	[ss-2015-021] Fix rewrite hash links XSS	2015-11-11 16:52:53 +13:00
SSViewer.php	Merge remote-tracking branch 'origin/3.2' into 3	2015-12-22 14:07:52 +13:00
TemplateGlobalProvider.php	FIX Remove instances of lines longer than 120c	2012-09-30 17:18:13 +13:00
TemplateIteratorProvider.php	Remove end php tag from TemplateIteratorProvider	2012-10-10 11:15:55 +13:00
TemplateParser.php	Feature to allow that changing the SSTemplateParser through the Injector system	2013-10-18 12:42:39 +13:00
ViewableData.php	Deprecate ViewableData magic caching logic	2015-07-27 17:14:18 +01:00