Commit graph

10 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
Luigy Leon
17fcc25d87 add include header files to extra-source-files 2016-01-04 23:05:05 -05:00
Julian K. Arni
79d4f944a4 less OverlappingInstances noise 2016-01-04 13:09:11 -05:00
Julian K. Arni
a4a0f1988b Bump wai and warp upper bound to < 3.3. 2016-01-04 17:21:14 +01:00
Julian K. Arni
72acd1a19d Bump upper bound for http-types. 2015-10-13 20:53:56 +02:00
Sönke Hahn
747b35d66d make travis builds use stack 2015-09-06 09:04:55 -07:00
Julian K. Arni
1c9d5baa99 Bump versions to 0.5 2015-07-27 22:26:49 +02:00
Alp Mestanogullari
fe0e526aa1 haddocks for Servant.Mock 2015-07-23 13:00:37 +02:00
Alp Mestanogullari
349cc1089b transformers bound 2015-07-22 21:49:24 +02:00
Alp Mestanogullari
87c3bd590e first shot at Servant.Mock 2015-07-22 21:22:42 +02:00