Merge branch 'master' into dev

This commit is contained in:
Jonas Winkler
2019-05-21 13:06:16 +02:00
35 changed files with 587 additions and 297 deletions

1
.gitignore vendored
View File

@@ -66,6 +66,7 @@ media/overrides.js
# Sqlite database
db.sqlite3
db.sqlite3-journal
# PyCharm
.idea