diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-09 16:30:42 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-09 16:30:42 +0100 |
| commit | a86a6926ee7b7f2a506218870bef79876366c24e (patch) | |
| tree | 22d8b84b4bd67f8d19e468ce41d5a784e48300fc /phpBB/phpbb | |
| parent | f6524f4902bc843908ade3583d5453ce58b5327a (diff) | |
| parent | e8a4526f4a1739b92fe6ef8f53c40c728f0a050f (diff) | |
| download | forums-a86a6926ee7b7f2a506218870bef79876366c24e.tar forums-a86a6926ee7b7f2a506218870bef79876366c24e.tar.gz forums-a86a6926ee7b7f2a506218870bef79876366c24e.tar.bz2 forums-a86a6926ee7b7f2a506218870bef79876366c24e.tar.xz forums-a86a6926ee7b7f2a506218870bef79876366c24e.zip | |
Merge pull request #4098 from Nicofuma/ticket/14382-master
[ticket/14382] Specify the branch-alias in the composer.json files
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/composer.json | 7 |
1 files changed, 6 insertions, 1 deletions
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" + } + } } |