summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-26 13:14:59 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-26 13:14:59 +0000
commit14ff33bd93152027990bb7d961e0be98bf1c26b5 (patch)
tree96092b7759947da81d12450ad49c712d845cf02d /.gitignore
parentAdd client v2_alpha resource to synapse server resource tree (diff)
parentAdd client v2_alpha resource to synapse server resource tree (diff)
downloadsynapse-14ff33bd93152027990bb7d961e0be98bf1c26b5.tar.xz
Merge branch 'develop' into client_v2_sync
Conflicts:
	synapse/rest/client/v2_alpha/__init__.py
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 2ed22b1cd3..3899c5a250 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,9 @@ uploads
 
 .idea/
 media_store/
+
+*.tac
+
+build/
+
+localhost-800*/