diff options
| author |   Joas Schilling <nickvergessen@gmx.de> | 2015-04-03 18:42:25 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-03 18:42:25 +0200 |
| commit | 6889248cdf48e29a2877f36c720e28d336685fe3 (patch) | |
| tree | 6ab36f5fd80cc76aa6125c6d3726db2050b927b9 /build | |
| parent | Merge branch '3.1.x' (diff) | |
| parent | Merge branch '3.0.x' into 3.1.x (diff) | |
| download | phpbb-6889248cdf48e29a2877f36c720e28d336685fe3.tar.gz phpbb-6889248cdf48e29a2877f36c720e28d336685fe3.tar.bz2 phpbb-6889248cdf48e29a2877f36c720e28d336685fe3.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'build')
| -rw-r--r-- | build/sami-all.conf.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build/sami-all.conf.php b/build/sami-all.conf.php index 68350fee8f..fb1a269206 100644 --- a/build/sami-all.conf.php +++ b/build/sami-all.conf.php @@ -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); |