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
..
tutorial	Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates	2016-09-02 12:53:04 +10:00
building-the-docs	Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates	2016-09-02 12:53:04 +10:00
conf.py	Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates	2016-09-02 12:53:04 +10:00
examples.md	Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates	2016-09-02 12:53:04 +10:00
index.rst	Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates	2016-09-02 12:53:04 +10:00
introduction.rst	Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates	2016-09-02 12:53:04 +10:00
links.rst	Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates	2016-09-02 12:53:04 +10:00
Makefile	Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates	2016-09-02 12:53:04 +10:00
requirements.txt	Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates	2016-09-02 12:53:04 +10:00