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)
1  2 
tine20/Tinebase/Config.php
tine20/Tinebase/Controller/ScheduledImport.php

Simple merge