From 3f40a8986408e2fde2e3a354259c03efa74f6599 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Wed, 23 Dec 2015 20:02:51 +0100
Subject: [PATCH] [ticket/14382] Specify the branch-alias in the composer.json
 files

PHPBB3-14382
---
 phpBB/composer.json       | 5 +++++
 phpBB/phpbb/composer.json | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/phpBB/composer.json b/phpBB/composer.json
index 8a177b3cf4..6b3a2c9918 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -51,5 +51,10 @@
 		"symfony/finder": "2.3.*",
 		"symfony/http-foundation": "2.3.*",
 		"symfony/process": "2.3.*"
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "3.1.x-dev"
+		}
 	}
 }
diff --git a/phpBB/phpbb/composer.json b/phpBB/phpbb/composer.json
index 513d7e4559..6b3888ef64 100644
--- a/phpBB/phpbb/composer.json
+++ b/phpBB/phpbb/composer.json
@@ -23,5 +23,10 @@
 	},
 	"require": {
 		"php": ">=5.3.3"
-    }
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "3.1.x-dev"
+		}
+	}
 }