aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-11-12 21:43:56 +0100
committerAndreas Fischer <bantu@phpbb.com>2014-11-12 21:43:56 +0100
commit01034785213435e7d90523f626694f3a9c71fb79 (patch)
treeec35045fe2e815a20bc28fd323e325e3b3dca920 /travis/sami.conf.php
parentMerge pull request #3139 from prototech/ticket/13239 (diff)
parent[ticket/13331] Use docs target for this branch, add docs-all for dev branches. (diff)
downloadphpbb-01034785213435e7d90523f626694f3a9c71fb79.tar.gz
phpbb-01034785213435e7d90523f626694f3a9c71fb79.tar.bz2
phpbb-01034785213435e7d90523f626694f3a9c71fb79.zip
Merge pull request #3142 from bantu/ticket/13331
[ticket/13331] Use docs target for this branch, add docs-all for all branches * bantu/ticket/13331: [ticket/13331] Use docs target for this branch, add docs-all for dev branches. Conflicts: build/build.xml build/sami-checkout.conf.php
Diffstat (limited to 'travis/sami.conf.php')
0 files changed, 0 insertions, 0 deletions