diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-10 13:10:57 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-10-10 13:10:57 +0100 |
commit | 91f43dca3939cd6ccbc90d19a284d00f6e14fd7c (patch) | |
tree | cb15ddf14a01a0e67b9eaf91b482d65bf2057f4e /.gitignore | |
parent | Newsfile (diff) | |
parent | Add domain validation when creating room with list of invitees (#6121) (diff) | |
download | synapse-91f43dca3939cd6ccbc90d19a284d00f6e14fd7c.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sql_bytes
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e53d4908d5..af36c00cfa 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,11 @@ *.egg-info *.lock *.pyc +*.snap *.tac _trial_temp/ _trial_temp*/ +/out # stuff that is likely to exist when you run a server locally /*.db |