1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 02:21:43 +02:00

Merge branch '3.0.x' into 3.1.x

This commit is contained in:
Joas Schilling
2015-04-03 18:42:06 +02:00

View File

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