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)
commit703641ff1d7482a5559d53fbb64e71fd59f6b4db
tree0cbb5e1ca476cfa2241d70a7a197bd2e24bee6be
parentccf78d51021b4e3454a90ca48983fe58a2a120d5
parent226fe4293a67b6e4590be47f2dcd1d6cb6d200f9
Merge branch '2015.11-develop' into 2016.11
tine20/Tinebase/Config.php