Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Feb 2017 13:07:08 +0000 (14:07 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Feb 2017 13:07:08 +0000 (14:07 +0100)
commit7d21fea4cb6bbf6846318420c2fb9c817cf15cdf
tree67210158e8392609e753612cfd6da388b7c27d6d
parentc21e0334c0fa567633ce24bb73ef7e0ac8800687
parent0e1394d4046c8a73758abb8f87f4fd902d90f645
Merge branch '2016.11' into 2016.11-develop

Change-Id: If58433cea71cb00159f2b275a4aba2a7231afbe6
tine20/Addressbook/js/ContactGrid.js
tine20/Tinebase/FileSystem.php
tine20/Tinebase/js/tineInit.js
tine20/Tinebase/js/widgets/grid/FilterPanel.js