Merge branch '2.1' into 2

2017-11-28 10:49:33 +13:00 · 2017-11-28 10:49:33 +13:00 · 77e5a5e18c
parent 978a5a19ce dbf10488ee
commit 77e5a5e18c
1 changed files with 0 additions and 5 deletions
--- a/composer.json
+++ b/composer.json
@ -20,11 +20,6 @@
 	"require-dev": {
 		"phpunit/phpunit": "^5.7"
 	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "2.1.x-dev"
-		}
-	},
 	"autoload": {
 		"psr-4": {
 			"SilverStripe\\SQLite\\": "code/"