Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Jan 2017 16:38:08 +0000 (17:38 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Jan 2017 16:38:08 +0000 (17:38 +0100)
1  2 
tests/tine20/Calendar/Frontend/WebDAV/ContainerTest.php
tine20/Admin/Frontend/Json.php
tine20/Calendar/Frontend/WebDAV/Container.php
tine20/Tinebase/Auth/CredentialCache.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/WebDav/Container/Abstract.php

Simple merge
Simple merge