Ingo Schommer 0e5524af44 Merge remote-tracking branch 'origin/tmp-3.1.0' into 3.1 ... Conflicts: docs/en/changelogs/3.1.1.md tests/behat/features/profile.feature		2013-10-07 15:19:07 +02:00
..
code	Merge pull request #2474 from wilr/externalcmslink	2013-10-02 02:38:56 -07:00
css	FEATURE: Disable specific tree nodes in TreeDropdownField	2013-10-02 12:53:23 +01:00
images	FEATURE: Disable specific tree nodes in TreeDropdownField	2013-10-02 12:53:23 +01:00
javascript	API: Add attributes argument for CMSMenuItem.	2013-10-02 19:06:54 +13:00
scss	FEATURE: Disable specific tree nodes in TreeDropdownField	2013-10-02 12:53:23 +01:00
templates	Merge remote-tracking branch 'origin/tmp-3.1.0' into 3.1	2013-10-07 15:19:07 +02:00
tests	API: Add attributes argument for CMSMenuItem.	2013-10-02 19:06:54 +13: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