Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 23 Nov 2016 13:55:47 +0000 (14:55 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 23 Nov 2016 13:55:47 +0000 (14:55 +0100)
commitf4fe3c11a217daba3b346ad3aa6015978cc240d3
treefa423c06c81ed8120eab12c5f8b9c6f21137ad05
parentb4f0fea47c8d91754f62a0bdce4c316d5676e0fd
parent735980ae060181227d76c04f1869eeee1e24fb9b
Merge branch '2015.11-develop' into 2016.11
tine20/Calendar/Frontend/Json.php
tine20/Tinebase/User.php