on master help sign in
prepare merge
commit88f1a3fc15dd28d4936aef862813ae748af54e95 authorJulian K. Arni <jkarni@gmail.com> dateMon 20 Apr 2015, 11:19 (11 years ago) parente4b2e15
16 files changed−37
.gitignore−17 .travis.yml−20 CHANGELOG.md → servant-docs/CHANGELOG.md LICENSE → servant-docs/LICENSE README.md → servant-docs/README.md Setup.hs → servant-docs/Setup.hs default.nix → servant-docs/default.nix docs.sh → servant-docs/docs.sh example/greet.hs → servant-docs/example/greet.hs example/greet.md → servant-docs/example/greet.md servant-docs.cabal → servant-docs/servant-docs.cabal shell.nix → servant-docs/shell.nix src/Servant/Docs.hs → servant-docs/src/Servant/Docs.hs src/Servant/Docs/Internal.hs → servant-docs/src/Servant/Docs/Internal.hs test/Servant/DocsSpec.hs → servant-docs/test/Servant/DocsSpec.hs test/Spec.hs → servant-docs/test/Spec.hs
.gitignoredeleted−17
@@ -1,17 +0,0 @@
1−dist
2−cabal-dev
3−*.o
4−*.hi
5−*.chi
6−*.chs.h
7−*.dyn_o
8−*.dyn_hi
9−.virtualenv
10−.hpc
11−.hsenv
12−.cabal-sandbox/
13−cabal.sandbox.config
14−cabal.config
15−*.prof
16−*.aux
17−*.hp
.travis.ymldeleted−20
@@ -1,20 +0,0 @@
1−language: haskell
2−
3−ghc:
4− - 7.8
5−
6−before_install:
7− - git clone https://github.com/haskell-servant/servant.git
8− - cabal sandbox init
9− - cabal sandbox add-source servant/
10−
11−notifications:
12− irc:
13− channels:
14− - "irc.freenode.org#servant"
15− template:
16− - "%{repository}#%{build_number} - %{commit} on %{branch} by %{author}: %{message}"
17− - "Build details: %{build_url} - Change view: %{compare_url}"
18− skip_join: true
19− on_success: change
20− on_failure: always
CHANGELOG.md → servant-docs/CHANGELOG.mdrenamed

The content is the same.

LICENSE → servant-docs/LICENSErenamed

The content is the same.

README.md → servant-docs/README.mdrenamed

The content is the same.

Setup.hs → servant-docs/Setup.hsrenamed

The content is the same.

default.nix → servant-docs/default.nixrenamed

The content is the same.

docs.sh → servant-docs/docs.shrenamed

The content is the same.

example/greet.hs → servant-docs/example/greet.hsrenamed

The content is the same.

example/greet.md → servant-docs/example/greet.mdrenamed

The content is the same.

servant-docs.cabal → servant-docs/servant-docs.cabalrenamed

The content is the same.

shell.nix → servant-docs/shell.nixrenamed

The content is the same.

src/Servant/Docs.hs → servant-docs/src/Servant/Docs.hsrenamed

The content is the same.

src/Servant/Docs/Internal.hs → servant-docs/src/Servant/Docs/Internal.hsrenamed

The content is the same.

test/Servant/DocsSpec.hs → servant-docs/test/Servant/DocsSpec.hsrenamed

The content is the same.

test/Spec.hs → servant-docs/test/Spec.hsrenamed

The content is the same.