Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Apr 2017 06:53:28 +0000 (08:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Apr 2017 06:53:28 +0000 (08:53 +0200)
commit975e094ff5964925e4b10df817f646c13988b906
tree704374bbf3c19a9943c1ebc259f8ea75ed14f3db
parentf9af553d7208fb981294140a17a9b168ea00d292
parentd1ad65d330be4544930752c660d593530540eac6
Merge branch '2016.11' into 2016.11-develop

Change-Id: I68aaeaf5dec3465968bc273b8bc2eb8560402b8c
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Felamimail/Controller/Message.php
tine20/Tinebase/Auth/Imap.php
tine20/Tinebase/Config.php