merge master into newsletter

v1-0-stable
Christian Merten 9 years ago
commit 44fd6dfdde

7
.gitignore vendored

@ -90,11 +90,12 @@ ENV/
jdav_web/db.sqlite3
*.swp
# django database migrations
*/*/migrations/*
# test images for file upload
*.jpeg
*.png
jdav_web/media
jdav_web/*/migrations
*.py.swp
# django database migrations
*/*/migrations/*

Loading…
Cancel
Save