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)
commitaccbb36a5783d3ebe39d937db4999924b0c5bb93
treefd2517e025fe77967a243898e1a68e7de792cd03
parentb0edcc2d2375c414bf02150ca7239da65eefc3ca
parent192eb97eada3660025b89af75c515d0bd2948dcf
Merge branch '2016.11-develop' into 2017.11
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Cli.php