Merge remote-tracking branch 'origin/3.2' into 3.3

2016-05-13 16:50:35 +12:00 · 2016-05-13 16:50:35 +12:00 · 9c42bb7b4d
parent 0a3570808a ff589cb4e3
commit 9c42bb7b4d
1 changed files with 0 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@ -10,7 +10,6 @@
 		"silverstripe-themes/simple": "3.1.*"
 	},
 	"require-dev": {
-		"ext-tidy": "*",
 		"phpunit/PHPUnit": "~3.7@stable"
 	},
 	"extra": {