Oliver Walters 731ec25b24 Merge remote-tracking branch 'inventree/master' into django-q ...

# Conflicts:
#	.github/workflows/style.yaml
#	.travis.yml
#	InvenTree/InvenTree/settings.py

2021-03-31 22:17:38 +11:00

..

ci.yaml

…

coverage.yaml

…

mariadb.yaml

Specify database name

2021-03-31 21:54:13 +11:00

mysql.yaml

Specify database name

2021-03-31 21:54:13 +11:00

postgresql.yaml

Specify database name

2021-03-31 21:48:54 +11:00

style.yaml

…