diff options
| author |   Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-23 20:02:51 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-09 15:36:43 +0100 |
| commit | 3f40a8986408e2fde2e3a354259c03efa74f6599 (patch) | |
| tree | 41fd1a127d76074ce507325bb0f2a632a12ff3a8 /phpBB/composer.json | |
| parent | Merge pull request #4084 from exussum12/ticket/14046 (diff) | |
| download | phpbb-3f40a8986408e2fde2e3a354259c03efa74f6599.tar.gz phpbb-3f40a8986408e2fde2e3a354259c03efa74f6599.tar.bz2 phpbb-3f40a8986408e2fde2e3a354259c03efa74f6599.zip | |
[ticket/14382] Specify the branch-alias in the composer.json files
PHPBB3-14382
Diffstat (limited to 'phpBB/composer.json')
| -rw-r--r-- | phpBB/composer.json | 5 |
1 files changed, 5 insertions, 0 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" + } } } |