Ingo Schommer 455e550d9a Merge remote-tracking branch 'origin/3.1' ... Conflicts: docs/en/topics/testing/create-silverstripe-test.md forms/Form.php i18n/i18n.php model/Image.php		2013-09-27 19:22:14 +02:00
..
code	Merge remote-tracking branch 'origin/3.1'	2013-09-27 19:22:14 +02:00
css	Merge remote-tracking branch 'origin/3.1'	2013-09-27 19:22:14 +02:00
images	Fixed Tab floating in CMS (fixes #1778)	2013-06-13 00:04:56 +02:00
javascript	Merge remote-tracking branch 'origin/3.1'	2013-09-27 19:22:14 +02:00
scss	Merge remote-tracking branch 'origin/3.1'	2013-09-27 19:22:14 +02:00
templates	Fixed merge error (mainly new translation entity format in templates)	2013-08-09 15:27:28 +02:00
tests	Correct line length and indentation	2013-08-21 18:54:05 +12:00
thirdparty	Updated history.js dependency	2013-03-20 00:46:32 +01:00
_config.php	BUG: Image resize allows skewing of image in IE (fixes CMS #791)	2013-09-04 15:01:46 +12:00
.gitignore	MINOR Removing executable flag from all files (thanks miiihi)	2011-09-18 22:04:02 +02:00
config.rb	MINOR Removing compass asset_cache_buster functionality, as it wrongly changes the hashes even if files haven't changed, causing merging hassles - leave cache control to the webserver	2011-12-20 17:46:43 +01:00