Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Feb 2017 12:51:50 +0000 (13:51 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Feb 2017 12:51:50 +0000 (13:51 +0100)
commit0e1394d4046c8a73758abb8f87f4fd902d90f645
tree5ac520590c8d34fdbcc510f94ca51961290698b4
parent98df265ff868faaf54ae8337a1b44f981ae64116
parentaaf50d6af709fe1d57ac897942fff68b86d07536
Merge branch '2015.11-develop' into 2016.11

Change-Id: I7cac68e2d1b963eb2020b2cf479c82e69bd237d4
tests/tine20/Tinebase/Server/Plugin/JsonTests.php
tine20/Tinebase/js/tineInit.js