summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-27 16:11:43 +0100
committerErik Johnston <erik@matrix.org>2014-08-27 16:11:43 +0100
commit89c044c2a0727c73cce4e6bff9a25a87da6f52bd (patch)
tree22d342f5beae7218c4f3664db8a888ddbafc4dab /.gitignore
parentapi docs: Finished adding all C-S APIs. Added initialSync, publicRooms, membe... (diff)
parentTurn off presence again. (diff)
downloadsynapse-89c044c2a0727c73cce4e6bff9a25a87da6f52bd.tar.xz
Merge branch 'stream_refactor' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 55fa8b819c..c214971e11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,10 @@ htmlcov
 
 demo/*.db
 demo/*.log
+demo/*.pid
+
+graph/*.svg
+graph/*.png
+graph/*.dot
+
+uploads