makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4098 from Nicofuma/ticket/14382-master

Browse source 
[ticket/14382] Specify the branch-alias in the composer.json files
This commit is contained in:
Marc Alexander 2016-01-09 16:30:42 +01:00
commit a86a6926ee
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/composer.json
View file

@ -57,5 +57,10 @@
"symfony/browser-kit": "2.8.*", "symfony/browser-kit": "2.8.*",
"symfony/css-selector": "2.8.*", "symfony/css-selector": "2.8.*",
"symfony/dom-crawler": "2.8.*" "symfony/dom-crawler": "2.8.*"
},
"extra": {
"branch-alias": {
"dev-master": "3.2.x-dev"
}
} }
} }

7
phpBB/phpbb/composer.json
View file

@ -23,5 +23,10 @@
}, },
"require": { "require": {
"php": ">=5.4" "php": ">=5.4"
} },
"extra": {
"branch-alias": {
"dev-master": "3.2.x-dev"
}
}
} }