Merge commit 'ec4e6f9df2ab9ffdc62a3f59675369096e0d3f77' as 'docs'

gohugoio · Aug 10, 2017 · 2238f7a · 2238f7a
1 parent d384c66
commit 2238f7a
Show file tree

Hide file tree

Showing 1,185 changed files with 43,549 additions and 61,804 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,18 +1,2 @@
-hugo
-docs/public*
 /.idea
-hugo.exe
-*.test
-*.prof
-nohup.out
-cover.out
-*.swp
-*.swo
-.DS_Store
-*~
-vendor/*/
-*.bench
-coverage*.out
-
-GoBuilds
-dist
+/public
diff --git a/.goxc.json b/.goxc.json
diff --git a/.mailmap b/.mailmap
diff --git a/.travis.yml b/.travis.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/Dockerfile b/Dockerfile
diff --git a/Makefile b/Makefile