Merge pull request #188 from slang800/master

unignore the web/builds dir
twitter · Jun 16, 2014 · d400e2f · d400e2f
2 parents e2cc18e + a1b9c46
commit d400e2f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,16 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
+max_line_length = 80
+
+[Makefile]
+indent_style = tab
diff --git a/.npmignore b/.npmignore
@@ -1,5 +1,9 @@
 test
 tools
-web
+web/1.0.0
+web/images
+web/stylesheets
+web/favicon.ico
+web/index.html.mustache
 wrappers
 Makefile