Composer update, bump branch-alias to 0.6.x

Updating the current dev version of SilverStripe has required FRAMEWORK_PATH to be defined in the bootstrap file.
camspiers · Feb 12, 2015 · ba66477 · ba66477
1 parent 4dc5b48
commit ba66477
Show file tree

Hide file tree

Showing 3 changed files with 142 additions and 109 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
 	},
 	"require": {
 		"composer/installers": "~1.0",
-		"monolog/monolog": "~1.7.0",
+		"monolog/monolog": "~1.7",
 		"filp/whoops": "1.*"
 	},
 	"require-dev": {
@@ -25,7 +25,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "0.5.x-dev"
+			"dev-master": "0.6.x-dev"
 		}
 	}
 }