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
..
Servant	Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates	2016-09-02 12:53:04 +10:00
Spec.hs	rename servant-jquery to servant-js, Servant.JQuery to Servant.JS	2015-07-22 19:25:02 +02:00