3 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
Julian K. Arni	6eb7add53a	stylish haskell changes ... And import fix.	2015-08-18 00:07:12 +02:00
Alp Mestanogullari	87c3bd590e	first shot at Servant.Mock	2015-07-22 21:22:42 +02:00