Merge changes from development

This commit is contained in:
MartenBE
2020-08-03 00:48:45 +02:00
14 changed files with 143 additions and 43 deletions

1
.gitignore vendored
View File

@@ -131,6 +131,7 @@ uwsgi.ini
installer.log
pyshelf_nginx.conf
!docker/pyshelf_nginx.conf
.env
tags
TAGS
config.json