4 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	32612c903c	Review fixes	2016-01-07 17:19:31 +01:00
Julian K. Arni	832f1b985f	Review fixes and note about CI.	2016-01-07 13:05:13 +01:00
Julian K. Arni	f66981fc8a	First pass at CONTRIBUTING	2016-01-07 00:53:17 +01:00