Daniel Hensby a5da085cc7 Merge branch '3'		2017-01-31 17:03:53 +00:00
..
client	Merge pull request #6527 from open-sausages/pulls/4.0/form-field-name	2017-01-31 13:49:05 +13:00
code	Merge branch '3'	2017-01-31 17:03:53 +00:00
templates/SilverStripe	Merge branch '3'	2017-01-31 17:03:53 +00:00
tests	Merge branch '3'	2017-01-31 17:03:53 +00:00
themes	API Add bootstrap button row template	2016-09-21 15:59:12 +12:00
thirdparty	Enhancement resize icon to sit inline and increase size of search icon and Upload icon	2017-01-10 10:51:07 +13:00
_config.php	BUG abstract HTMLEditorConfig instantiates (#6244)	2016-10-28 15:21:44 +13:00
.gitignore	MINOR Removing executable flag from all files (thanks miiihi)	2011-09-18 22:04:02 +02:00