Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jonas Winkler
2018-12-11 12:06:15 +01:00
46 changed files with 1171 additions and 695 deletions

1
.gitignore vendored
View File

@@ -73,7 +73,6 @@ db.sqlite3
# Other stuff that doesn't belong
.virtualenv
virtualenv
.vagrant
docker-compose.yml
docker-compose.env