Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 26 Oct 2016 12:46:32 +0000 (14:46 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 26 Oct 2016 12:46:32 +0000 (14:46 +0200)
commita12522e2e6422113a06ab7843d295fab2ab4b723
treedc233bf4bea9e871aa5ee255b290742e95e5b705
parent930fd7c6c4632d280fa17b34280c192c4a3aec34
parent2bf5842d6dc457d3e75cf790ca2fa358e9dc8ad4
Merge branch '2015.11' into 2015.11-develop
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Felamimail/js/sieve/RulesGridPanel.js
tine20/Tinebase/Container.php
tine20/Tinebase/Model/Filter/FilterGroup.php