Oliver Walters f9449da576 Merge remote-tracking branch 'upstream/master' into django-q ... # Conflicts: # InvenTree/InvenTree/version.py		2021-04-11 15:03:33 +10:00
..
inventree	Updates to docker files	2021-04-11 14:46:40 +10:00
nginx	Adds nxinx service	2021-04-10 22:25:07 +10:00
docker-compose.yml	Merge remote-tracking branch 'upstream/master' into django-q	2021-04-11 15:03:33 +10:00