Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 2 Feb 2017 08:13:46 +0000 (09:13 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 2 Feb 2017 08:13:46 +0000 (09:13 +0100)
Change-Id: Ifc6716919d0aa5eaf8e87ffca8fec61f16d1874c

1  2 
tine20/Setup/Controller.php
tine20/Tinebase/DateTime.php
tine20/composer.lock

Simple merge
Simple merge
Simple merge