diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-03 01:12:37 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-03 01:12:37 +1100 |
| commit | ea708efedd7f207ce3fc05835612391816f8d4a1 (patch) | |
| tree | 42bdd87aaffc48f6d92c7e6b4d748e2c8cb821fe /.gitignore | |
| parent | changelog (diff) | |
| parent | Fix typing being reset causing infinite syncs (#4127) (diff) | |
| download | synapse-ea708efedd7f207ce3fc05835612391816f8d4a1.tar.xz | |
Merge branch 'develop' into matthew/heroes-for-avatars github/matthew/heroes-for-avatars matthew/heroes-for-avatars
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1718185384..3b2252ad8a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,11 @@ *.pyc .*.swp *~ +*.lock .DS_Store _trial_temp/ +_trial_temp*/ logs/ dbs/ *.egg |