prepare merge

Browse Source

...

This commit is contained in:

Julian K. Arni 2015-04-20 11:21:21 +02:00

parent 68a129dcd3

commit 90ad8248d7

33 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0

CHANGELOG.md → servant/CHANGELOG.md

Unescape Escape View File

0

LICENSE → servant/LICENSE

Unescape Escape View File

0

README.md → servant/README.md

Unescape Escape View File

0

Setup.hs → servant/Setup.hs

Unescape Escape View File

0

default.nix → servant/default.nix

Unescape Escape View File

0

docs.sh → servant/docs.sh

Unescape Escape View File

0

servant.cabal → servant/servant.cabal

Unescape Escape View File

0

servant.png → servant/servant.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 26 KiB After Width:  |  Height:  |  Size: 26 KiB

0

src/Servant/API.hs → servant/src/Servant/API.hs

Unescape Escape View File

0

src/Servant/API/Alternative.hs → servant/src/Servant/API/Alternative.hs

Unescape Escape View File

0

src/Servant/API/Capture.hs → servant/src/Servant/API/Capture.hs

Unescape Escape View File

0

src/Servant/API/ContentTypes.hs → servant/src/Servant/API/ContentTypes.hs

Unescape Escape View File

0

src/Servant/API/Delete.hs → servant/src/Servant/API/Delete.hs

Unescape Escape View File

0

src/Servant/API/Get.hs → servant/src/Servant/API/Get.hs

Unescape Escape View File

0

src/Servant/API/Header.hs → servant/src/Servant/API/Header.hs

Unescape Escape View File

0

src/Servant/API/MatrixParam.hs → servant/src/Servant/API/MatrixParam.hs

Unescape Escape View File

0

src/Servant/API/Patch.hs → servant/src/Servant/API/Patch.hs

Unescape Escape View File

0

src/Servant/API/Post.hs → servant/src/Servant/API/Post.hs

Unescape Escape View File

0

src/Servant/API/Put.hs → servant/src/Servant/API/Put.hs

Unescape Escape View File

0

src/Servant/API/QueryParam.hs → servant/src/Servant/API/QueryParam.hs

Unescape Escape View File

0

src/Servant/API/Raw.hs → servant/src/Servant/API/Raw.hs

Unescape Escape View File

0

src/Servant/API/ReqBody.hs → servant/src/Servant/API/ReqBody.hs

Unescape Escape View File

0

src/Servant/API/ResponseHeaders.hs → servant/src/Servant/API/ResponseHeaders.hs

Unescape Escape View File

0

src/Servant/API/Sub.hs → servant/src/Servant/API/Sub.hs

Unescape Escape View File

0

src/Servant/Common/Text.hs → servant/src/Servant/Common/Text.hs

Unescape Escape View File

0

src/Servant/Utils/Links.hs → servant/src/Servant/Utils/Links.hs

Unescape Escape View File

0

test/Doctests.hs → servant/test/Doctests.hs

Unescape Escape View File

0

test/Servant/API/ContentTypesSpec.hs → servant/test/Servant/API/ContentTypesSpec.hs

Unescape Escape View File

0

test/Servant/API/ResponseHeadersSpec.hs → servant/test/Servant/API/ResponseHeadersSpec.hs

Unescape Escape View File

0

test/Servant/Common/TextSpec.hs → servant/test/Servant/Common/TextSpec.hs

Unescape Escape View File

0

test/Servant/Utils/LinksSpec.hs → servant/test/Servant/Utils/LinksSpec.hs

Unescape Escape View File

0

test/Spec.hs → servant/test/Spec.hs

Unescape Escape View File

0

update-nixpkgs.sh → servant/update-nixpkgs.sh

Unescape Escape View File