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)
1  2 
tine20/Calendar/Frontend/Json.php
tine20/Tinebase/User.php

Simple merge
Simple merge