Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Dec 2016 12:08:45 +0000 (13:08 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Dec 2016 12:08:45 +0000 (13:08 +0100)
commita34bdb7ae98d9400413e1ee4d36a6bad4d390ffa
tree83365c1a4c65485f6b8b83034ca7fbc95e6b9017
parent93c970f3dca2ccab26eafe7c270cacfa5150c76b
parent14a0b54e831f4ed9cf2239fa97e14f93a455c38d
Merge branch '2015.11' into 2015.11-develop

Change-Id: Id2478150229f6d8148683d1631e76a33ce67545e
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/Convert/Contact/VCard/Abstract.php
tine20/Felamimail/Controller/Message/Send.php
tine20/Tinebase/Controller.php
tine20/Tinebase/js/widgets/dialog/ImportDialog.js