summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-14 18:04:36 +0100
committerErik Johnston <erik@matrix.org>2015-09-14 18:04:36 +0100
commit228465b0ecfc7d7137ac3acaf30050e234957b6a (patch)
tree1e273d754bc819fecfb877e19a15a08b4d1e231a /.gitignore
parentOnly allow people to set the alias list for their own domain. (diff)
parentMerge pull request #265 from matrix-org/erikj/check_room_exists (diff)
downloadsynapse-github/erikj/check_alias.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/check_alias github/erikj/check_alias erikj/check_alias
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4c336b710d..f8c4000134 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,6 @@ build/
 localhost-800*/
 static/client/register/register_config.js
 .tox
+
+env/
+*.config