Merge branch '3.3' into 3

This commit is contained in:
Sam Minnee 2016-05-13 16:53:04 +12:00
commit 23cf0b8e8d

View File

@ -10,7 +10,6 @@
"silverstripe-themes/simple": "3.1.*"
},
"require-dev": {
"ext-tidy": "*",
"phpunit/PHPUnit": "~3.7@stable"
},
"extra": {