prepare merge

LumiGuide · Apr 20, 2015 · 88f1a3f · 88f1a3f
1 parent e4b2e15
commit 88f1a3f
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md → servant-docs/CHANGELOG.md b/CHANGELOG.md → servant-docs/CHANGELOG.md
diff --git a/LICENSE → servant-docs/LICENSE b/LICENSE → servant-docs/LICENSE
diff --git a/README.md → servant-docs/README.md b/README.md → servant-docs/README.md
diff --git a/Setup.hs → servant-docs/Setup.hs b/Setup.hs → servant-docs/Setup.hs
diff --git a/default.nix → servant-docs/default.nix b/default.nix → servant-docs/default.nix
diff --git a/docs.sh → servant-docs/docs.sh b/docs.sh → servant-docs/docs.sh
diff --git a/example/greet.hs → servant-docs/example/greet.hs b/example/greet.hs → servant-docs/example/greet.hs
diff --git a/example/greet.md → servant-docs/example/greet.md b/example/greet.md → servant-docs/example/greet.md
diff --git a/servant-docs.cabal → servant-docs/servant-docs.cabal b/servant-docs.cabal → servant-docs/servant-docs.cabal
diff --git a/shell.nix → servant-docs/shell.nix b/shell.nix → servant-docs/shell.nix
diff --git a/src/Servant/Docs.hs → servant-docs/src/Servant/Docs.hs b/src/Servant/Docs.hs → servant-docs/src/Servant/Docs.hs
diff --git a/src/Servant/Docs/Internal.hs → servant-docs/src/Servant/Docs/Internal.hs b/src/Servant/Docs/Internal.hs → servant-docs/src/Servant/Docs/Internal.hs
diff --git a/test/Servant/DocsSpec.hs → servant-docs/test/Servant/DocsSpec.hs b/test/Servant/DocsSpec.hs → servant-docs/test/Servant/DocsSpec.hs
diff --git a/test/Spec.hs → servant-docs/test/Spec.hs b/test/Spec.hs → servant-docs/test/Spec.hs