aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2015-05-30 12:54:27 +0200
committerOliver Schramm <oliver.schramm97@gmail.com>2015-05-30 12:54:27 +0200
commit049f584111b5d7ce307d57d36b3be8a34d06194b (patch)
tree9c9cf84e226372d6c11de39aaaa51130a4e6b3b9
parentd6cd90d3258387493da813a1251252c57344c405 (diff)
parentd589142c0b00ae5aebff382394d931c3408f2072 (diff)
downloadforums-049f584111b5d7ce307d57d36b3be8a34d06194b.tar
forums-049f584111b5d7ce307d57d36b3be8a34d06194b.tar.gz
forums-049f584111b5d7ce307d57d36b3be8a34d06194b.tar.bz2
forums-049f584111b5d7ce307d57d36b3be8a34d06194b.tar.xz
forums-049f584111b5d7ce307d57d36b3be8a34d06194b.zip
Merge pull request #3638 from naderman/ticket/13874
[ticket/13874] Add master to sami API docs
-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 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);