Merge pull request #4257 from aaronraimist/add-editorconfig

Add a basic .editorconfig
matrix-org · Dec 4, 2018 · a484735 · a484735
2 parents 52e87fb + 3518c28
commit a484735
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,9 @@
+# EditorConfig https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# 4 space indentation
+[*.py]
+indent_style = space
+indent_size = 4
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -26,6 +26,7 @@ recursive-include synapse/static *.js
 exclude Dockerfile
 exclude .dockerignore
 exclude test_postgresql.sh
+exclude .editorconfig
 
 include pyproject.toml
 recursive-include changelog.d *

diff --git a/changelog.d/4257.misc b/changelog.d/4257.misc
@@ -0,0 +1 @@
+Add a basic .editorconfig