Damian Mooyman aef4b80fda Merge remote-tracking branch 'origin/3.0' into 3.1 ... Conflicts: .travis.yml forms/ConfirmedPasswordField.php		2014-05-06 10:06:58 +12:00
..
code	Merge remote-tracking branch 'origin/3.0' into 3.1	2014-05-06 10:06:58 +12:00
css	Tidy up active tab styles to match background, border alignment on page tabs.	2014-01-29 15:47:15 +13:00
images	Dialog icon size	2013-12-21 16:11:06 +13:00
javascript	BUG Fix jstree when duplicating subtrees	2014-04-29 16:00:07 +12:00
scss	Tidy up active tab styles to match background, border alignment on page tabs.	2014-01-29 15:47:15 +13:00
templates	Updated translation masters	2013-12-19 19:51:25 +01:00
tests	Fixing failing tests because ?locale= is appended to the end of the URL.	2014-01-17 13:48:46 +13:00
thirdparty	Updated history.js dependency	2013-03-20 00:46:32 +01:00
_config.php	Merge pull request #2297 from colymba/htmleditorconfig-mode-fix	2014-03-17 08:22:14 +13:00
.gitignore	MINOR Removing executable flag from all files (thanks miiihi)	2011-09-18 22:04:02 +02:00
config.rb	Set default encoding for compass	2013-10-30 16:11:11 +00:00