Robin fb498b9534 fix merge conflicts		2010-04-28 12:01:05 +02:00
..
Server	fix merge conflicts	2010-04-28 12:01:05 +02:00
Tools	Update to the svn version of "HTTP WebDAV server" (integration to owncloud was made with alimited knowledge, so it may be ugly).Anyway it improves a lot the score on litmus testsuite on my server.	2010-04-21 12:04:22 +02:00
Server.php	fix merge conflicts	2010-04-28 12:01:05 +02:00