Merge pull request #4098 from Nicofuma/ticket/14382-master

[ticket/14382] Specify the branch-alias in the composer.json files

phpBB/composer.json

@@ -57,5 +57,10 @@
 		"symfony/browser-kit": "2.8.*",
 		"symfony/css-selector": "2.8.*",
 		"symfony/dom-crawler": "2.8.*"
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "3.2.x-dev"
+		}
 	}
 }

phpBB/phpbb/composer.json

@@ -23,5 +23,10 @@
 	},
 	"require": {
 		"php": ">=5.4"
-    }
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "3.2.x-dev"
+		}
+	}
 }