Commit graph

16 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
f66981fc8a First pass at CONTRIBUTING 2016-01-07 00:53:17 +01:00
Julian K. Arni
b2589a2171 Don't self-promote at all 2015-09-20 14:14:09 +02:00
Julian K. Arni
1beb3ad07f A little less self-promoting 2015-09-20 14:01:59 +02:00
Julian K. Arni
ffb095c0c7 self-promote 2015-09-20 13:32:27 +02:00
Jonathan Lange
ff3e15dbd2 Rename update-nix-files to generate-nix-files 2015-09-08 20:39:20 +01:00
Sönke Hahn
ef058417bc README: typo 2015-09-07 09:53:46 -07:00
Julian K. Arni
98b6e85128 Contributing 2015-08-17 23:50:42 +02:00
Alp Mestanogullari
eabf13ebdb rename servant-jquery to servant-js, Servant.JQuery to Servant.JS 2015-07-22 19:25:02 +02:00
Alp Mestanogullari
3745446128 tweak README 2015-05-11 10:36:41 +02:00
Julian K. Arni
d418ed4b0e Update READMEs 2015-04-20 15:48:37 +02:00
Julian K. Arni
90ad8248d7 prepare merge 2015-04-20 11:21:21 +02:00
Julian K. Arni
fb71eb8f01 Enable coveralls 2015-02-19 20:32:05 +01:00
Julian K. Arni
7f7ab2c804 Use hackage doc links.
Rather than our own stale ones.
2015-02-18 13:18:28 +01:00
Alp Mestanogullari
14a2750411 update README to refflect the servant/servant-server split 2014-12-12 10:39:08 +01:00
Alp Mestanogullari
55eb020d10 polish up cabal file, add a README 2014-12-08 10:56:02 +01:00