Merge pull request #88 from tractorcow/pulls/fix-deps

Update composer to point to now fixed 2.1 branch of bulk editing tools
2014-12-15 15:34:13 +13:00 · 2014-12-15 15:34:13 +13:00 · c73f9f48f0
parent 589e2e4660 1d315983a4
commit c73f9f48f0
1 changed files with 6 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@ -9,9 +9,14 @@
 	}],
 	"require": {
 		"silverstripe/framework": "~3.1",
-		"colymba/gridfield-bulk-editing-tools": "2.0.2"
+		"colymba/gridfield-bulk-editing-tools": "~2.1"
 	},
 	"suggest": {
 		"ezyang/htmlpurifier": "4.*"
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "1.2.x-dev"
+		}
 	}
 }