Ingo Schommer 56f7ce1dcf Merge remote-tracking branch 'origin/3.0' ... Conflicts: control/Cookie.php control/Director.php control/HTTPResponse.php model/Database.php model/MySQLDatabase.php model/SQLQuery.php view/Requirements.php view/SSViewer.php		2012-10-03 16:16:19 +02:00
..
code	FIX Remove instances of lines longer than 120c	2012-09-30 17:18:13 +13:00
css	Merge remote-tracking branch 'origin/3.0'	2012-10-03 16:16:19 +02:00
images	ENHANCEMENT: Change media insertion to use button and apply design	2012-06-11 10:54:48 +02:00
javascript	Merge remote-tracking branch 'origin/3.0'	2012-10-03 16:16:19 +02:00
scss	Merge remote-tracking branch 'origin/3.0'	2012-10-03 16:16:19 +02:00
templates	Merge remote-tracking branch 'origin/3.0'	2012-10-03 16:16:19 +02: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	FIX Remove instances of lines longer than 120c	2012-09-30 17:18:13 +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