From c359aac93a4cd9c1d99638f41947983244219551 Mon Sep 17 00:00:00 2001
From: Schlabonski <fthielemann@gmx.de>
Date: Thu, 20 Oct 2016 11:38:45 +0200
Subject: [PATCH] merge .gitignore into master

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

diff --git a/.gitignore b/.gitignore
index 34a26a5..27eecc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,7 @@ ENV/
 # Rope project settings
 .ropeproject
 jdav_web/db.sqlite3
+*.py.swp
+
+# django database migrations
+*/*/migrations/*