aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-12-27 08:28:15 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-12-27 08:28:15 +0100
commit3ae799f4ded9201d8c07e8ee47b8dd386304d0e0 (patch)
treecf794d1e6e571f8a1be156ae2872c990695a3458 /build
parent230472de4529c4a9c0468488bee0edc6f08086c6 (diff)
parent3e5090e792e6ba2be4ee1119ebdd6e82d9ef53e3 (diff)
downloadforums-3ae799f4ded9201d8c07e8ee47b8dd386304d0e0.tar
forums-3ae799f4ded9201d8c07e8ee47b8dd386304d0e0.tar.gz
forums-3ae799f4ded9201d8c07e8ee47b8dd386304d0e0.tar.bz2
forums-3ae799f4ded9201d8c07e8ee47b8dd386304d0e0.tar.xz
forums-3ae799f4ded9201d8c07e8ee47b8dd386304d0e0.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'build')
-rw-r--r--build/sami-all.conf.php1
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')
;