diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-13 14:23:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-14 10:22:43 +0100 |
| commit | 6f7540ada44b26d6eced6788650a08df672d0610 (patch) | |
| tree | 37fbc9d465a630ec2ac244d8860b35bbfcbd697d /.gitignore | |
| parent | Fix email push notifs being dropped (diff) | |
| parent | Merge pull request #1168 from matrix-org/rav/ui_auth_on_device_delete (diff) | |
| download | synapse-6f7540ada44b26d6eced6788650a08df672d0610.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_email_notifs
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 |