diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2016-07-08 14:12:43 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2016-07-08 14:12:43 +0200 |
| commit | 7f50c798e680434443d742a2341daee1cdb2594f (patch) | |
| tree | 08f302e7b16cf1e7b3fd8f0762fbda92b5a994ae /build | |
| parent | 45ba2e9770f2f012423bfc2a831771f48357e182 (diff) | |
| parent | 927cc2ebad149605eed6edb551fa3ea0601df2cc (diff) | |
| download | forums-7f50c798e680434443d742a2341daee1cdb2594f.tar forums-7f50c798e680434443d742a2341daee1cdb2594f.tar.gz forums-7f50c798e680434443d742a2341daee1cdb2594f.tar.bz2 forums-7f50c798e680434443d742a2341daee1cdb2594f.tar.xz forums-7f50c798e680434443d742a2341daee1cdb2594f.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14689] Build API docs for 3.2.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 9c10209e8b..4bf812eb02 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('3.2.x') ->add('master') ; |