Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Apr 2016 10:21:17 +0000 (12:21 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Apr 2016 10:21:17 +0000 (12:21 +0200)
commitc7a87a8e411bb20c73d6d35df6543115acb2a44a
tree1326734fed1112cd1257927169cdf3713c839a40
parent5447cc7e29374288a55e51e03ef97ca6c6359d8c
parentff3635d2030d026452b2d44a8f53d86c9fe96de4
Merge branch '2014.11-develop' into 2015.11
tine20/Tinebase/Backend/Sql/Abstract.php
tine20/Tinebase/WebDav/Collection/AbstractContainerTree.php