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

9 years ago · f675c4ef8e
parent e4b30347c4 b02010ae6c
commit f675c4ef8e
3 changed files with 2 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -91,8 +91,8 @@ jdav_web/db.sqlite3
 *.swp

 # test images for file upload
-*.jpeg
-*.png
+#*.jpeg
+#*.png
 jdav_web/media
 jdav_web/*/migrations
 *.py.swp
--- a/jdav_web/static/admin/images/jdav_logo.png
+++ b/jdav_web/static/admin/images/jdav_logo.png
--- a/jdav_web/static/admin/images/jdav_logo_small.png
+++ b/jdav_web/static/admin/images/jdav_logo_small.png