aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-12-23 20:02:51 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-01-09 15:36:43 +0100
commit3f40a8986408e2fde2e3a354259c03efa74f6599 (patch)
tree41fd1a127d76074ce507325bb0f2a632a12ff3a8 /phpBB/phpbb
parent84ed888cb9642918575008e91da9bef82f80ce69 (diff)
downloadforums-3f40a8986408e2fde2e3a354259c03efa74f6599.tar
forums-3f40a8986408e2fde2e3a354259c03efa74f6599.tar.gz
forums-3f40a8986408e2fde2e3a354259c03efa74f6599.tar.bz2
forums-3f40a8986408e2fde2e3a354259c03efa74f6599.tar.xz
forums-3f40a8986408e2fde2e3a354259c03efa74f6599.zip
[ticket/14382] Specify the branch-alias in the composer.json files
PHPBB3-14382
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/composer.json7
1 files changed, 6 insertions, 1 deletions
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"
+ }
+ }
}