fex-team · cool-firer · Jun 5, 2014 · Jun 10, 2014 · Jun 10, 2014 · Jun 10, 2014
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+[*.{html,js,css,scss,xml}]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,11 @@
 ###############
 .idea
 log
-upload
+jsp/upload
+php/upload
+net/upload
+asp/upload
+node/upload
 
 
 ###############
@@ -164,7 +168,7 @@ Desktop.ini
 dist
 eggs
 parts
-bin
+# bin
 var
 sdist
 develop-eggs