Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 24 Oct 2016 14:34:47 +0000 (16:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 24 Oct 2016 14:34:47 +0000 (16:34 +0200)
commit226fe4293a67b6e4590be47f2dcd1d6cb6d200f9
tree79023f2e33383607b089578db5f62f77c84ff5f2
parent180d64f184f8b25996be8a84b676d6a93b6d84ca
parentda50f49a0b85e3c06f395b7cee95b80cc2b2e3b7
Merge branch '2015.11' into 2015.11-develop
tine20/Tinebase/Config.php
tine20/Tinebase/Controller/ScheduledImport.php