Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Apr 2017 19:44:17 +0000 (21:44 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Apr 2017 19:44:17 +0000 (21:44 +0200)
commit96c3cfdfe85e1f6eabbe131c4ac245ba07249d59
treec0fd69b13b38bfb6b1b39d87b6cf44eec3a43a2f
parente11bbfcf61394e78e87e7b1721936ab871dde880
parent7f05c2f9fa1ca1ca3966cb5edb84ab416c06a906
Merge branch '2016.11' into 2016.11-develop

Change-Id: I1528ce4669cd329d2c34d1c288bc3d03086cc50b
tests/tine20/Tinebase/Frontend/JsonTest.php
tine20/Calendar/Controller/EventNotifications.php
tine20/Calendar/Model/Attender.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/js/widgets/mainscreen/WestPanel.js