prepare merge
commit90ad8248d73a89266a4a78a12428e59d7b1067ea
authorJulian K. Arni <jkarni@gmail.com>
dateMon 20 Apr 2015, 11:21 (11 years ago)
parent68a129d
CHANGELOG.md → servant/CHANGELOG.mdrenamed
The content is the same.
LICENSE → servant/LICENSErenamed
The content is the same.
README.md → servant/README.mdrenamed
The content is the same.
Setup.hs → servant/Setup.hsrenamed
The content is the same.
default.nix → servant/default.nixrenamed
The content is the same.
docs.sh → servant/docs.shrenamed
The content is the same.
servant.cabal → servant/servant.cabalrenamed
The content is the same.
servant.png → servant/servant.pngrenamed
Binary file not shown.
src/Servant/API.hs → servant/src/Servant/API.hsrenamed
The content is the same.
src/Servant/API/Alternative.hs → servant/src/Servant/API/Alternative.hsrenamed
The content is the same.
src/Servant/API/Capture.hs → servant/src/Servant/API/Capture.hsrenamed
The content is the same.
src/Servant/API/ContentTypes.hs → servant/src/Servant/API/ContentTypes.hsrenamed
The content is the same.
src/Servant/API/Delete.hs → servant/src/Servant/API/Delete.hsrenamed
The content is the same.
src/Servant/API/Get.hs → servant/src/Servant/API/Get.hsrenamed
The content is the same.
src/Servant/API/Header.hs → servant/src/Servant/API/Header.hsrenamed
The content is the same.
src/Servant/API/MatrixParam.hs → servant/src/Servant/API/MatrixParam.hsrenamed
The content is the same.
src/Servant/API/Patch.hs → servant/src/Servant/API/Patch.hsrenamed
The content is the same.
src/Servant/API/Post.hs → servant/src/Servant/API/Post.hsrenamed
The content is the same.
src/Servant/API/Put.hs → servant/src/Servant/API/Put.hsrenamed
The content is the same.
src/Servant/API/QueryParam.hs → servant/src/Servant/API/QueryParam.hsrenamed
The content is the same.
src/Servant/API/Raw.hs → servant/src/Servant/API/Raw.hsrenamed
The content is the same.
src/Servant/API/ReqBody.hs → servant/src/Servant/API/ReqBody.hsrenamed
The content is the same.
src/Servant/API/ResponseHeaders.hs → servant/src/Servant/API/ResponseHeaders.hsrenamed
The content is the same.
src/Servant/API/Sub.hs → servant/src/Servant/API/Sub.hsrenamed
The content is the same.
src/Servant/Common/Text.hs → servant/src/Servant/Common/Text.hsrenamed
The content is the same.
src/Servant/Utils/Links.hs → servant/src/Servant/Utils/Links.hsrenamed
The content is the same.
test/Doctests.hs → servant/test/Doctests.hsrenamed
The content is the same.
test/Servant/API/ContentTypesSpec.hs → servant/test/Servant/API/ContentTypesSpec.hsrenamed
The content is the same.
test/Servant/API/ResponseHeadersSpec.hs → servant/test/Servant/API/ResponseHeadersSpec.hsrenamed
The content is the same.
test/Servant/Common/TextSpec.hs → servant/test/Servant/Common/TextSpec.hsrenamed
The content is the same.
test/Servant/Utils/LinksSpec.hs → servant/test/Servant/Utils/LinksSpec.hsrenamed
The content is the same.
test/Spec.hs → servant/test/Spec.hsrenamed
The content is the same.
update-nixpkgs.sh → servant/update-nixpkgs.shrenamed
The content is the same.