aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/composer.json5
-rw-r--r--phpBB/phpbb/composer.json7
2 files changed, 11 insertions, 1 deletions
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"
+ }
+ }
}