diff options
| author | David Baker <dave@matrix.org> | 2016-10-14 15:10:38 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-10-14 15:10:38 +0100 |
| commit | bcb1245a2d4746d539ef60b9ca40e7ad16056efa (patch) | |
| tree | c5927411c6d329bbabbf3e41f8d98cda588b24ff /.gitignore | |
| parent | Make password reset email field case insensitive (diff) | |
| parent | Merge pull request #1169 from matrix-org/erikj/fix_email_notifs (diff) | |
| download | synapse-bcb1245a2d4746d539ef60b9ca40e7ad16056efa.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_insensitive
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index f8c4000134..491047c352 100644 --- a/.gitignore +++ b/.gitignore @@ -24,10 +24,10 @@ homeserver*.yaml .coverage htmlcov -demo/*.db -demo/*.log -demo/*.log.* -demo/*.pid +demo/*/*.db +demo/*/*.log +demo/*/*.log.* +demo/*/*.pid demo/media_store.* demo/etc |