Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Mar 2017 10:22:00 +0000 (12:22 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Mar 2017 10:22:00 +0000 (12:22 +0200)
commit27e1baf76ba436942161dcaa4c67a9456bbcf1c2
tree3338c99501ef490b7aab36d0edc818a8a5b1374e
parentae0f2c248d65c6139e91f27d837cbf9662bf7e12
parent465a1c0965939a0395c4d17dc70f4a532420fdd8
Merge branch '2016.11' into 2016.11-develop

Change-Id: I91a637a18b479e932f0b2f93ad3586abab538e39
tests/tine20/Addressbook/JsonTest.php
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Tinebase/Container.php
tine20/Tinebase/Controller/Abstract.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Core.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/Frontend/Cli/Abstract.php
tine20/Tinebase/User/Sql.php