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)
commitb48d1a91b804dad8afd9bd47bae662ee7414453c
tree4f4bb41198eeebd29e0476abc00e61fc297b9c87
parent55e451ec39c6e236534c10fdf736842edeaa8363
parent2939cbb11701e9635f6e937cabe3568fbe269a84
Merge branch '2016.11' into 2016.11-develop

Change-Id: Ifc6716919d0aa5eaf8e87ffca8fec61f16d1874c
tine20/Setup/Controller.php
tine20/Tinebase/DateTime.php
tine20/composer.lock