silverstripe-framework/admin
Damian Mooyman e9c3ff933f Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	composer.json
2014-05-06 10:22:09 +12:00
..
code Merge remote-tracking branch 'origin/3.1' 2014-05-06 10:22:09 +12:00
css Merge remote-tracking branch 'origin/3.1' 2014-02-04 08:19:04 +13:00
images Dialog icon size 2013-12-21 16:11:06 +13:00
javascript Merge remote-tracking branch 'origin/3.1' 2014-05-06 10:22:09 +12:00
scss Merge remote-tracking branch 'origin/3.1' 2014-02-04 08:19:04 +13:00
templates added logout url to Security and deprecated Security::set_login_url in favour of config 2013-12-20 21:55:54 +00:00
tests Merge remote-tracking branch 'origin/3.1' 2014-02-04 08:19:04 +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