diff options
author | Erik Johnston <erik@matrix.org> | 2015-09-14 18:05:31 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-09-14 18:05:31 +0100 |
commit | d59acb8c5b7ff74b0045b1e4df0c79ce6f645004 (patch) | |
tree | b7427c8e6cf1d48cab0341fbcbda307707e75338 /.gitignore | |
parent | Also check the domains for membership state_keys (diff) | |
parent | Merge pull request #265 from matrix-org/erikj/check_room_exists (diff) | |
download | synapse-d59acb8c5b7ff74b0045b1e4df0c79ce6f645004.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
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 |