persistent2
resourcet 1.1
Bump upper bounds for base and text
Merge pull request #1 from fpco/fpco-all-ghc78

Bump upper bounds for base and text
Merge branch 'master' of github.com:meteficha/esqueleto into HEAD

Conflicts:
	esqueleto.cabal
	src/Database/Esqueleto/Internal/Sql.hs
Merge remote-tracking branch 'origin/persistent2' into persistent2

Conflicts:
	esqueleto.cabal
More persistent2 updates
Merge branch 'persistent2' of github.com:fpco/esqueleto

Conflicts:
	esqueleto.cabal
	src/Database/Esqueleto.hs
Merge pull request #66 from fpco/persistent2

Persistent2