Merge branch 'master' into development

9 years ago · 6d4b3c8360
parent d7409daa7a c359aac93a
commit 6d4b3c8360
1 changed files with 4 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -90,9 +90,10 @@ ENV/
 jdav_web/db.sqlite3
 *.swp

-# django database migrations
-*/*/migrations/*
-
 # test images for file upload
 *.jpeg
 *.png
+*.py.swp
+
+# django database migrations
+*/*/migrations/*