Commit graph

5 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
1ea1340c5c Use env bash rather than /bin/bash. 2015-12-25 15:50:28 +01:00
Christian Marie
627158845b Make bump-versions.sh work
This also makes it behave when called from from any directory.
2015-07-06 17:05:45 +10:00
Julian K. Arni
aec39b546e Upload script and some script refactoring 2015-06-05 14:40:05 +02:00
Julian K. Arni
49289ecbb4 Add bump-versions script 2015-05-26 12:18:26 +02:00