Commit graph

7 commits

Author SHA1 Message Date
Alex Mason
6462804f52 Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates
# Conflicts:
#	servant-server/servant-server.cabal
#	servant-server/src/Servant/Server/Internal.hs
#	servant-server/test/Servant/ServerSpec.hs
#	servant/servant.cabal
#	servant/src/Servant/API.hs
2016-09-02 12:53:04 +10:00
Nickolay Kudasov
1e26ba25d1 Update http-api-data dependency 2015-10-08 00:57:39 +03:00
Nickolay Kudasov
40d2c68897 Use http-api-data package instead of ToText/FromText 2015-10-08 00:38:47 +03:00
Julian Arni
a1dc0561a3 Merge pull request #232 from dredozubov/servant-foreign
Common code generation types and helpers extracted to servant-foreign
2015-09-23 14:41:59 +02:00
Denis Redozubov
6fa4b55c94 fix build settings for ghc-7.8.4 2015-09-21 21:34:38 +03:00
Nickolay Kudasov
e3f5a357e1 Fix GHC 7.8 build
Added missing control-monad-omega dependency.
2015-09-19 01:44:36 +03:00
Sönke Hahn
747b35d66d make travis builds use stack 2015-09-06 09:04:55 -07:00