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 |
|
Index Int
|
f2f7b061d2
|
Drop EitherT in favor of ExceptT
|
2015-09-12 15:11:24 +03:00 |
|
Alp Mestanogullari
|
ff6c04cf1a
|
update examples in servant-client. fixes #75
|
2015-05-14 00:52:37 +02:00 |
|
Julian K. Arni
|
d418ed4b0e
|
Update READMEs
|
2015-04-20 15:48:37 +02:00 |
|
Julian K. Arni
|
45f35852f8
|
prepare merge
|
2015-04-20 11:15:58 +02:00 |
|