Merge branch '2.1' into 2.2

orchestral · Oct 7, 2014 · 417745f · 417745f
2 parents abd3515 + 348fc69
commit 417745f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/Guardfile b/Guardfile
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.3-dev"
+			"dev-master": "3.0-dev"
 		}
 	},
 	"minimum-stability": "dev"