Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Oct 2016 09:22:50 +0000 (11:22 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Oct 2016 09:22:50 +0000 (11:22 +0200)
commit8630328f21aab6439037922b4f8182515be815c4
tree90e28d9d79eda175bdc197c5030ab128a42761e0
parent132d72a1c05bf7e7d40b0e40a30bf2a7ce51ef07
parentdb657bf2e899a6c7ee3240b90b26477d094d7aa0
Merge branch '2015.11' into 2015.11-develop

Change-Id: I5f657461875e964df047f7e5cd25e9dffe283db5
tine20/Addressbook/Model/ContactFilter.php
tine20/Addressbook/js/Model.js
tine20/Setup/Frontend/Cli.php