eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
servant/servant-mock
History
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
..
example Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates 2016-09-02 12:53:04 +10:00
include less OverlappingInstances noise 2016-01-04 13:09:11 -05:00
src/Servant Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates 2016-09-02 12:53:04 +10:00
test Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates 2016-09-02 12:53:04 +10:00
.ghci Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates 2016-09-02 12:53:04 +10:00
LICENSE Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates 2016-09-02 12:53:04 +10:00
servant-mock.cabal Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates 2016-09-02 12:53:04 +10:00
Setup.hs stylish haskell changes 2015-08-18 00:07:12 +02:00
tinc.yaml Use tinc on travis 2015-11-05 09:32:13 +08:00