diff options
author | Marc Alexander <admin@m-a-styles.de> | 2019-12-27 08:28:15 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2019-12-27 08:28:15 +0100 |
commit | 3ae799f4ded9201d8c07e8ee47b8dd386304d0e0 (patch) | |
tree | cf794d1e6e571f8a1be156ae2872c990695a3458 /build | |
parent | Merge branch '3.2.x' into 3.3.x (diff) | |
parent | Merge pull request #5791 from marc1706/ticket/16271 (diff) | |
download | phpbb-3ae799f4ded9201d8c07e8ee47b8dd386304d0e0.tar.gz phpbb-3ae799f4ded9201d8c07e8ee47b8dd386304d0e0.tar.bz2 phpbb-3ae799f4ded9201d8c07e8ee47b8dd386304d0e0.zip |
Merge branch '3.2.x' into 3.3.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 4bf812eb02..91f12f296e 100644 --- a/build/sami-all.conf.php +++ b/build/sami-all.conf.php @@ -26,6 +26,7 @@ $config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../' ->add('3.0.x') ->add('3.1.x') ->add('3.2.x') + ->add('3.3.x') ->add('master') ; |