Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Sep 2016 08:21:23 +0000 (10:21 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Sep 2016 08:21:23 +0000 (10:21 +0200)
commitcbf9f1244ae4e8d196cc3067311ef41d2dbc665a
tree33f9236c9c7584efb63bbcce98e0b83514e71a7d
parentc68c72d87c141123118de52aef165b439a1f473f
parent47bca21c302369dfe59e84842097eee0a3f84014
Merge branch '2015.11-develop' into 2016.11

Change-Id: I3099c009d27126eb9715cc6e62c991218125c4b7
tests/tine20/Felamimail/Controller/MessageTest.php
tine20/Tinebase/Helper.php
tine20/composer.json
tine20/composer.lock