Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jul 2016 10:35:43 +0000 (12:35 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jul 2016 10:35:43 +0000 (12:35 +0200)
1  2 
tine20/Tinebase/FileSystem.php
tine20/Tinebase/Server/WebDAV.php

Simple merge
Simple merge