Merge remote-tracking branch 'origin/master'

Ariadne-CMS · Jun 26, 2014 · ec1869d · ec1869d
2 parents 0c6cdf7 + f8816d6
commit ec1869d
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,14 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[**.php]
+indent_style = space
+indent_size = 4