diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/composer.json | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/composer.json | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index ca70519ddc..1b2625c593 100644 --- a/phpBB/composer.json +++ b/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" + } } } diff --git a/phpBB/phpbb/composer.json b/phpBB/phpbb/composer.json index 8241091dc1..758125234f 100644 --- a/phpBB/phpbb/composer.json +++ b/phpBB/phpbb/composer.json @@ -23,5 +23,10 @@ }, "require": { "php": ">=5.4" - } + }, + "extra": { + "branch-alias": { + "dev-master": "3.2.x-dev" + } + } } |