]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorRobin <robin@Amaya.(none)>
Wed, 28 Apr 2010 10:01:05 +0000 (12:01 +0200)
committerRobin <robin@Amaya.(none)>
Wed, 28 Apr 2010 10:01:05 +0000 (12:01 +0200)
commitfb498b9534b545c0e66cb82304e64f199c77a463
tree5dee29e558a580fe57d777aa41b493671b0f5a3b
parent09add452d93f185d89ab51b67cda2fc384772db5
parent854e0c5a9c9060e827fbbfddffeeeadfc2d27278
fix merge conflicts
inc/HTTP/WebDAV/Server.php
inc/HTTP/WebDAV/Server/Filesystem.php