summaryrefslogtreecommitdiffstats
path: root/webdav
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@dev.(none)>2010-03-29 16:29:51 +0200
committerFrank Karlitschek <frank@dev.(none)>2010-03-29 16:29:51 +0200
commit6602a61a38ab4bc29405c9e27b1c5ab62e457fb2 (patch)
tree06ce6e0cbbb0a1b0aa12e6bbcc42ce577bb4e515 /webdav
parent2a75c0d04495c5f05fdaaebf94d38ea6d0a3f062 (diff)
downloadnextcloud-server-6602a61a38ab4bc29405c9e27b1c5ab62e457fb2.tar.gz
nextcloud-server-6602a61a38ab4bc29405c9e27b1c5ab62e457fb2.zip
fix merge problem
Diffstat (limited to 'webdav')
0 files changed, 0 insertions, 0 deletions