diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-09 16:30:11 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-09 16:30:11 +0100 |
| commit | d64680983a5fa06a737a1ae7e164cb7f67a5a53c (patch) | |
| tree | 77f307bd7f019021387dbfbff87f858ab5688cf0 | |
| parent | 1f16421782639ad4308b59c2faaa06a913bfaa8d (diff) | |
| parent | 3f40a8986408e2fde2e3a354259c03efa74f6599 (diff) | |
| download | forums-d64680983a5fa06a737a1ae7e164cb7f67a5a53c.tar forums-d64680983a5fa06a737a1ae7e164cb7f67a5a53c.tar.gz forums-d64680983a5fa06a737a1ae7e164cb7f67a5a53c.tar.bz2 forums-d64680983a5fa06a737a1ae7e164cb7f67a5a53c.tar.xz forums-d64680983a5fa06a737a1ae7e164cb7f67a5a53c.zip | |
Merge pull request #4097 from Nicofuma/ticket/14382
[ticket/14382] Specify the branch-alias in the composer.json files
| -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 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" + } + } } |