Merge pull request #4257 from aaronraimist/add-editorconfig

Add a basic .editorconfig
2018-12-04 11:10:02 +01:00 · 2018-12-04 11:10:02 +01:00 · a484735bb0
parent 52e87fbfbe 3518c28aa8
commit a484735bb0
3 changed files with 11 additions and 0 deletions
--- 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
--- 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 *
--- a/changelog.d/4257.misc
+++ b/changelog.d/4257.misc
@ -0,0 +1 @@
+Add a basic .editorconfig