Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 May 2017 13:50:20 +0000 (15:50 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 May 2017 13:50:20 +0000 (15:50 +0200)
commitf402b1c7318eaa8326287c9cd954f73681649919
tree02804bb9038f0c790faaad769ae508d15554da84
parent137be99d0c6a1cd5b0dcb13acf3c728367c681c7
parent899e65758412f0e45076f2ec02fa23a01d758cc9
Merge branch '2016.11' into 2016.11-develop
tine20/Felamimail/Controller/Sieve.php
tine20/Felamimail/js/sieve/RulesGridPanel.js
tine20/Tinebase/Controller/ScheduledImport.php