diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 11:36:08 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 11:36:08 +0200 |
| commit | c62dc4fa80d622ed7651029e9ddff2a6c6327143 (patch) | |
| tree | 897a298b43f58b07de74188ae38f95965e9846d5 /lib/private/connector/sabre | |
| parent | fdc87eaeb360ad14ed243368ea8f74aafed32304 (diff) | |
| parent | ebb2278a6770cc68698e1ba5cb914d615b573519 (diff) | |
| download | nextcloud-server-c62dc4fa80d622ed7651029e9ddff2a6c6327143.tar.gz nextcloud-server-c62dc4fa80d622ed7651029e9ddff2a6c6327143.zip | |
Merge branch 'master' into fixing-4011-master
Conflicts:
lib/connector/sabre/directory.php
Diffstat (limited to 'lib/private/connector/sabre')
0 files changed, 0 insertions, 0 deletions