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 |
|