diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-23 15:51:48 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-23 15:51:48 +0000 |
commit | 9b1e552b5163aad84a3ae4fd70116d3e782fb443 (patch) | |
tree | 19d827838d10688da26e3fa5503c63b71fd34db0 /.gitignore | |
parent | Add storage method have_events (diff) | |
parent | Update .gitignore (diff) | |
download | synapse-9b1e552b5163aad84a3ae4fd70116d3e782fb443.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index af90668c89..3899c5a250 100644 --- a/.gitignore +++ b/.gitignore @@ -26,17 +26,18 @@ htmlcov demo/*.db demo/*.log +demo/*.log.* demo/*.pid +demo/media_store.* demo/etc -graph/*.svg -graph/*.png -graph/*.dot - -**/webclient/config.js -**/webclient/test/coverage/ -**/webclient/test/environment-protractor.js - uploads .idea/ +media_store/ + +*.tac + +build/ + +localhost-800*/ |