Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 12 Jul 2017 09:05:53 +0000 (11:05 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 12 Jul 2017 09:05:53 +0000 (11:05 +0200)
commitc71a670265df544dcf65b742fd3c94e8de20b117
treea5d78c1f6a0534f662b1a019750155f625f9775f
parent861db248616c2dcd5929bba3e7746507a4681747
parentf52c48422322d4047b62aa2a22b40b02dd3471cc
Merge branch '2016.11' into 2016.11-develop

Change-Id: If1d630ec5059f759772dfa1598b34423b3e99151
tests/tine20/Tinebase/Frontend/CliTest.php
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Tinebase/Backend/Sql/Abstract.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/User.php
tine20/Tinebase/User/Abstract.php