Merge branch 'master' into sqlite

This commit is contained in:
Joey Hess 2019-12-19 16:26:23 -04:00
commit 02e00fd7ab
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
37 changed files with 314 additions and 128 deletions

View file

@ -17,7 +17,6 @@ import Database.Types
import Database.Handle
import qualified Database.Queue as H
import Utility.InodeCache
import Utility.FileSystemEncoding
import Git.FilePath
import Database.Persist.Sql hiding (Key)