Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Sep 2016 17:06:07 +0000 (19:06 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Sep 2016 17:06:07 +0000 (19:06 +0200)
commitf3383b42f72acd7f4a54d4c74eb0980371a50120
tree43553093a5d224f3a0fd2426293a5f91d61c5cae
parentb4d46cb4f1964bfbf0a88b68a2f33e4ee9a33ccd
parent5091e301dda4cfe2d6b2faf5a88e8473ad9d59a2
Merge branch '2015.11-develop' into 2016.11

Change-Id: Ie35b0176f47e09c3a60216e431c230c959e97007
tests/tine20/Timetracker/JsonTest.php
tine20/Tinebase/js/common.js