summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorBruno Windels <brunow@matrix.org>2018-09-27 19:18:38 +0100
committerBruno Windels <brunow@matrix.org>2018-09-27 19:18:38 +0100
commitc5e1de677d137f0effe24a82c3c1846d60e72a9f (patch)
tree65d232f95219430c735d4864533515c354669702 /.gitignore
parentadd changelog (diff)
parentMerge pull request #3794 from matrix-org/erikj/faster_typing (diff)
downloadsynapse-github/bwindels/registerasregularuser.tar.xz
Merge branch 'develop' into bwindels/registerasregularuser github/bwindels/registerasregularuser bwindels/registerasregularuser
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore

index a725725235..3b2252ad8a 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,6 +1,7 @@ *.pyc .*.swp *~ +*.lock .DS_Store _trial_temp/