From 58691680b8dd93fab56fed914b0204f2b6751b6a Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Thu, 22 Jan 2015 14:20:53 +0000
Subject: update .gitignore, set media-store-path in demo

---
 .gitignore | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index af90668c89..2ed22b1cd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,17 +26,12 @@ 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/
-- 
cgit 1.4.1


From 30a89d2fdb8db9a06974fd9732c4eab5263dea79 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 23 Jan 2015 15:51:21 +0000
Subject: Update .gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to '.gitignore')

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*/
-- 
cgit 1.4.1