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

Merge branch '3.0.x' into 3.1.x

Browse source
This commit is contained in:
Joas Schilling 2015-04-03 18:42:06 +02:00
commit 81c92a7de9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build/sami-all.conf.php
View file

@ -18,13 +18,13 @@ $config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../'
This would be nice, but currently causes various problems that need
debugging.
->addFromTags('release-3.0.*')
->add('develop-olympus', '3.0-next (olympus)')
->add('3.0.x', '3.0-next (olympus)')
->addFromTags('release-3.1.*')
->add('develop-ascraeus', '3.1-next (ascraeus)')
->add('develop')
->add('3.1.x', '3.1-next (ascraeus)')
->add('master')
*/
->add('develop-olympus')
->add('develop-ascraeus')
->add('3.0.x')
->add('3.1.x')
;
return new Sami\Sami($iterator, $config);