Merge branch '2016.11-develop' into 2017.11
authorjenkins <tine20-jenkins@metaways.de>
Thu, 3 Aug 2017 14:50:40 +0000 (16:50 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Thu, 3 Aug 2017 14:50:40 +0000 (16:50 +0200)
1  2 
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Cli.php

Simple merge
Simple merge