Merge branch 'dev'

Pencroff · Apr 8, 2014 · 2782b26 · 2782b26
2 parents cea4121 + efdaf20
commit 2782b26
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 23 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,4 @@
-[submodule "MoaJs.wiki"]
- path = MoaJs.wiki
- url = [email protected]:Pencroff/MoaJs.wiki.git
 [submodule "doc"]
  path = doc
  url = [email protected]:Pencroff/MoaJs.git
- branch = gh-pages
+ branch = gh-page
diff --git a/doc b/doc
diff --git a/docstrap/template/static/styles/site.bootflat.css b/docstrap/template/static/styles/site.bootflat.css