diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-05-30 12:55:21 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-05-30 12:55:21 +0200 |
| commit | cdd76da6a30f501064bc22bd96240eefe5a9ae23 (patch) | |
| tree | ff630dc169a5e6e7ec18ac1d56140b29eb8e4466 /build | |
| parent | e9601813c17d55f2d2daf63300559c7df347954c (diff) | |
| parent | 049f584111b5d7ce307d57d36b3be8a34d06194b (diff) | |
| download | forums-cdd76da6a30f501064bc22bd96240eefe5a9ae23.tar forums-cdd76da6a30f501064bc22bd96240eefe5a9ae23.tar.gz forums-cdd76da6a30f501064bc22bd96240eefe5a9ae23.tar.bz2 forums-cdd76da6a30f501064bc22bd96240eefe5a9ae23.tar.xz forums-cdd76da6a30f501064bc22bd96240eefe5a9ae23.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'build')
| -rw-r--r-- | build/sami-all.conf.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/sami-all.conf.php b/build/sami-all.conf.php index fb1a269206..9c10209e8b 100644 --- a/build/sami-all.conf.php +++ b/build/sami-all.conf.php @@ -25,6 +25,7 @@ $config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../' */ ->add('3.0.x') ->add('3.1.x') + ->add('master') ; return new Sami\Sami($iterator, $config); |