Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 19 Aug 2016 07:41:47 +0000 (09:41 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 19 Aug 2016 07:41:47 +0000 (09:41 +0200)
commitcb2f4adaf868327291f6ad587e61d3746a091085
tree42fc76a96b992d07c9af2f9fb01d6f86813dfefc
parentecd2be02146377bb89d405899a4bb65721fe5a20
parent4a39ffa1a050e6bb33b20976a8edc341f19f12fd
Merge branch '2013.10' into 2014.11

Change-Id: I8b1972e6af0c2b648fdbd89cbe21e77c3c2f5f67
tests/tine20/Tinebase/User/LdapTest.php
tine20/Calendar/Frontend/WebDAV/Container.php
tine20/Setup/Frontend/Cli.php
tine20/Setup/Server/Cli.php
tine20/Tinebase/Config.php
tine20/Tinebase/User.php
tine20/Tinebase/User/ActiveDirectory.php
tine20/Tinebase/User/Ldap.php