Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 24 Oct 2016 14:35:07 +0000 (16:35 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 24 Oct 2016 14:35:07 +0000 (16:35 +0200)
1  2 
tine20/Tinebase/Config.php

Simple merge