Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jonas Winkler committed 2018-12-11 12:06:15 +01:00
commit 766109ae4e
46 files changed
+1171 -695

No files matched your search

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