diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-04-03 18:42:06 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-03 18:42:06 +0200 |
| commit | 81c92a7de9b24e589481efef390965c3230b487b (patch) | |
| tree | 88e54b8a36ee0da289137763a023e20ce5844985 | |
| parent | 55f6329c1d99dfbb20c9ac75423f261ec2cf9158 (diff) | |
| parent | 35d2467c94e8bb4b7c9c4919d5c6a3c98e0c85ed (diff) | |
| download | forums-81c92a7de9b24e589481efef390965c3230b487b.tar forums-81c92a7de9b24e589481efef390965c3230b487b.tar.gz forums-81c92a7de9b24e589481efef390965c3230b487b.tar.bz2 forums-81c92a7de9b24e589481efef390965c3230b487b.tar.xz forums-81c92a7de9b24e589481efef390965c3230b487b.zip | |
Merge branch '3.0.x' into 3.1.x
| -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); |