Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 23 Nov 2016 13:55:22 +0000 (14:55 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 23 Nov 2016 13:55:22 +0000 (14:55 +0100)
commit735980ae060181227d76c04f1869eeee1e24fb9b
treec07a33b0b675a66ae413e6a5285feef6b8db3640
parent2b3bf5f93d48be1208ffe46785536b62d43fece3
parent98de3d524133346ceac74b6236e46d169148e470
Merge branch '2015.11' into 2015.11-develop
tine20/Calendar/Frontend/Json.php