Ingo Schommer 072b485f66 Merge remote-tracking branch 'origin/3.0' into 3.1 ... Conflicts: lang/en.yml		2013-01-22 12:05:48 +01:00
..
code	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-01-22 12:05:48 +01:00
css	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-01-21 11:14:57 +01:00
images	Provide new save icon for the use in the framework.	2012-12-13 17:43:25 +01:00
javascript	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-01-21 11:14:57 +01:00
scss	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-01-21 11:14:57 +01:00
templates	Application Name fix	2013-01-21 08:09:47 +01:00
tests	FIX Remove instances of lines longer than 120c	2012-09-30 17:18:13 +13:00
thirdparty	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-01-21 11:14:57 +01: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