aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/composer.json')
-rw-r--r--phpBB/composer.json7
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json
index af1cd2b329..6b3a2c9918 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -25,7 +25,7 @@
"phpbb/phpbb-core": "self.version"
},
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.3,<7.0",
"lusitanian/oauth": "0.2.*",
"symfony/config": "2.3.*",
"symfony/console": "2.3.*",
@@ -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"
+ }
}
}