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)
commita3a9ce408c6114c018de005b4230c14c677e1762
treea3230180f40b1c27c94a88822a1e4d48b8c71e26
parentab8d5f26072b14854610f3ec7bc1c03d11850b94
parente56f61c553c771ff86a6bdba3b5d47c0bf2efcae
Merge branch '2015.11-develop' into 2016.11
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