diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:19:12 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:19:12 +0200 |
| commit | 4c2cf35050032002d01978f53201723330ebfe16 (patch) | |
| tree | cb931972aae1381d0d46aa934fa56f462e4c873a /apps/files/webdav.php | |
| parent | 711aa229b882d3fc5e2fa8c22e6db2ec05642984 (diff) | |
| parent | 1bba4456420d1824ab6d58f3d9bb523fcde5c4c2 (diff) | |
| download | nextcloud-server-4c2cf35050032002d01978f53201723330ebfe16.tar.gz nextcloud-server-4c2cf35050032002d01978f53201723330ebfe16.zip | |
fix merge conflicts
Diffstat (limited to 'apps/files/webdav.php')
0 files changed, 0 insertions, 0 deletions