Merge branch 'master' into smudge

2015-12-11 13:50:31 -04:00 · 2015-12-11 13:50:31 -04:00 · c608a752a5
commit c608a752a5
parent c910b4e255 abd66c7089
13 changed files with 163 additions and 26 deletions
--- a/Remote/WebDAV.hs
+++ b/Remote/WebDAV.hs
@ -191,7 +191,7 @@ testDav url (Just (u, p)) = do
 		makeParentDirs
 		void $ mkColRecursive tmpDir
 		inLocation (tmpLocation "git-annex-test") $ do
-			putContentM (Nothing, L.empty)
+			putContentM (Nothing, L8.fromString "test")
 			delContentM
  where
 	test a = liftIO $