Damian Mooyman a86ed93759 Merge remote-tracking branch 'origin/3' ...

Conflicts:
	docs/en/05_Contributing/01_Code.md

2015-02-20 14:09:38 +13:00

..

code

Merge remote-tracking branch 'origin/3'

2015-02-20 14:09:38 +13:00

css

Dropdowns admin styling

2015-02-08 18:59:38 +13:00

images

Update 'spinner' to an SilverStripe branded version

2015-01-14 20:29:07 +11:00

javascript

Merge remote-tracking branch 'origin/3.1' into 3

2015-02-20 10:17:19 +13:00

scss

Dropdowns admin styling

2015-02-08 18:59:38 +13:00

templates

Merge remote-tracking branch 'composer/3.1' into 3

2015-01-15 18:52:46 +13:00

tests

Form action validation excempts

2014-11-26 22:49:37 +13:00

thirdparty

Updated history.js dependency

2013-03-20 00:46:32 +01:00

_config.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12: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