Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Feb 2017 12:49:44 +0000 (13:49 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Feb 2017 12:49:44 +0000 (13:49 +0100)
commitaaf50d6af709fe1d57ac897942fff68b86d07536
treee53af404e943e3ae0599365686d43c9fc5d7201e
parentdb88ea7e7d3f2f47cb1a2a572972804f0bd1eab7
parent90d49a0915b1c8765a1ff5affe5b022eb3245843
Merge branch '2015.11' into 2015.11-develop

Change-Id: Id2ede59bdc1a79a0f96db44585c620193fe3401d
tine20/Addressbook/js/ContactGrid.js
tine20/Tinebase/js/tineInit.js