diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-09 15:42:42 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-09 15:42:42 +0100 |
| commit | e8a4526f4a1739b92fe6ef8f53c40c728f0a050f (patch) | |
| tree | 22d8b84b4bd67f8d19e468ce41d5a784e48300fc | |
| parent | c1eb7216503693d4047e2faa448d61cc9ad0477d (diff) | |
| download | forums-e8a4526f4a1739b92fe6ef8f53c40c728f0a050f.tar forums-e8a4526f4a1739b92fe6ef8f53c40c728f0a050f.tar.gz forums-e8a4526f4a1739b92fe6ef8f53c40c728f0a050f.tar.bz2 forums-e8a4526f4a1739b92fe6ef8f53c40c728f0a050f.tar.xz forums-e8a4526f4a1739b92fe6ef8f53c40c728f0a050f.zip | |
[ticket/14382] Specify the branch-alias in the composer.json files
PHPBB3-14382
| -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" + } + } } |