Ingo Schommer c55c7c33f8 Merge branch '3.0' ... Conflicts: admin/code/CMSProfileController.php composer.json tests/model/DataObjectTest.php		2012-11-22 23:51:28 +01:00
..
code	Merge branch '3.0'	2012-11-22 23:51:28 +01:00
css	Merge pull request #932 from clarkepaul/master	2012-11-07 06:29:05 -08:00
images	ENHANCEMENT Tab style consolidation and design consistency	2012-11-06 22:28:19 +01:00
javascript	Merge branch '3.0'	2012-11-22 23:51:28 +01:00
scss	Merge pull request #932 from clarkepaul/master	2012-11-07 06:29:05 -08:00
templates	Merge branch '3.0'	2012-11-22 23:51:28 +01:00
tests	FIX Remove instances of lines longer than 120c	2012-09-30 17:18:13 +13:00
thirdparty	Fix chosen dropdown width not being set.	2012-08-16 23:26:29 +02:00
_config.php	BUG Video embed from Add Media Feature no longer works (open #8033)	2012-11-15 15:49:03 +13: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