Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Mar 2017 11:32:41 +0000 (12:32 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Mar 2017 11:32:41 +0000 (12:32 +0100)
commit40ad5698e3dea57313429afa3a38d7da0fc12b41
tree3a8bfa4f8d13572c11a1dfa5ae7f56fb0d171b83
parent01e531f0057eeb1c5548797eb59dd5360a1732a5
parent3a95e75104ef85ab1253725d4adfcfac9c0a5fb4
Merge branch '2016.11' into 2016.11-develop

Change-Id: I276d3128e614c3beae28ae3d9868b57df9a559c8
tests/tine20/Addressbook/JsonTest.php
tine20/Addressbook/Config.php
tine20/Addressbook/Model/ContactFilter.php
tine20/Addressbook/Model/ContactHiddenFilter.php
tine20/Addressbook/js/ListMemberFilterModel.js
tine20/Addressbook/js/Model.js
tine20/Calendar/Controller/EventNotifications.php
tine20/Tinebase/ModelConfiguration.php