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)
Change-Id: I68aaeaf5dec3465968bc273b8bc2eb8560402b8c

1  2 
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Felamimail/Controller/Message.php
tine20/Tinebase/Auth/Imap.php
tine20/Tinebase/Config.php

Simple merge
Simple merge