Ingo Schommer 3214a0a756 Merge remote-tracking branch 'origin/3.0' ... Conflicts: admin/css/screen.css		2012-11-06 19:56:34 +01:00
..
code	Merge remote-tracking branch 'origin/3.0'	2012-11-06 19:56:34 +01:00
css	Merge remote-tracking branch 'origin/3.0'	2012-11-06 19:56:34 +01:00
images	ENHANCEMENT general css enhancements	2012-11-05 17:51:38 +13:00
javascript	Merge remote-tracking branch 'origin/3.0'	2012-11-06 19:56:34 +01:00
scss	Merge remote-tracking branch 'origin/3.0'	2012-11-06 19:56:34 +01:00
templates	Merge remote-tracking branch 'origin/3.0'	2012-11-06 19:56:34 +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	Merge branch 'tinymce_fancy_selectts' of https://github.com/halkyon/sapphire into 3.0	2012-10-05 14:39:27 +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