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

Simple merge