diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-07-27 11:40:51 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-07-27 11:40:51 +0200 |
| commit | a7a54331082c41c5b05cd7982c058caf1556f777 (patch) | |
| tree | bc51551c2430837856cdb1f3a1e04c46e0f664cb /3rdparty/Sabre/CalDAV/Server.php | |
| parent | e8010209bb1ec8ef9ecc1cff7ac2b2d4d414bd74 (diff) | |
| parent | d26f87e738314db7820f39f74f42865ff20f7bd7 (diff) | |
| download | nextcloud-server-a7a54331082c41c5b05cd7982c058caf1556f777.tar.gz nextcloud-server-a7a54331082c41c5b05cd7982c058caf1556f777.zip | |
Merge branch 'master' into chunked_upload
Conflicts:
lib/connector/sabre/directory.php
Diffstat (limited to '3rdparty/Sabre/CalDAV/Server.php')
| -rwxr-xr-x[-rw-r--r--] | 3rdparty/Sabre/CalDAV/Server.php | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/3rdparty/Sabre/CalDAV/Server.php b/3rdparty/Sabre/CalDAV/Server.php index 325e3d80a7f..325e3d80a7f 100644..100755 --- a/3rdparty/Sabre/CalDAV/Server.php +++ b/3rdparty/Sabre/CalDAV/Server.php |