Merge pull request #14 from gregumo/master

gregumo · gregumo · commit 65ef3d6433de · 2016-04-04T11:13:14.000+02:00
Change branch-alias to 1.5.x-dev
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
     "target-dir": "Victoire/Widget/ButtonBundle",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.3.x-dev"
+            "dev-master": "1.5.x-dev"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`"target-dir": "Victoire/Widget/ButtonBundle",`
`31`	`31`	`"extra": {`
`32`	`32`	`"branch-alias": {`
`33`		`- "dev-master": "1.3.x-dev"`
	`33`	`+ "dev-master": "1.5.x-dev"`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`