Merge remote-tracking branch 'origin/persistent2' into persistent2

Conflicts: esqueleto.cabal
2014-05-26 16:35:23 +03:00 · 2014-05-26 16:35:23 +03:00 · deceb9f242
commit deceb9f242
parent 2685cdb7f7 3604f768fe
1 changed files with 1 additions and 1 deletions
--- a/esqueleto.cabal
+++ b/esqueleto.cabal
@ -63,7 +63,7 @@ library
    Database.Esqueleto.Internal.PersistentImport
  build-depends:
      base                 >= 4.5    && < 4.8
-    , text                 >= 0.11
+    , text                 >= 0.11   && < 1.2
    , persistent           >= 2.0    && < 2.1
    , transformers         >= 0.2
    , unordered-containers >= 0.2