Merge branch 'newsletter_self' of https://github.com/Schlabonski/jdav_lb_webapp into newsletter_self

9 years ago · e5b0085f3a
parent e2751b22b1 cb7d77f0da
commit e5b0085f3a
1 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -96,3 +96,5 @@ jdav_web/db.sqlite3
 # test images for file upload
 *.jpeg
 *.png
+jdav_web/media
+jdav_web/*/migrations