Merge remote-tracking branch 'inventree/master' into build-fixes

Browse Source

# Conflicts:
#	InvenTree/InvenTree/views.py
#	InvenTree/build/views.py
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/order/views.py
#	InvenTree/part/api.py
#	InvenTree/part/views.py
#	InvenTree/templates/js/bom.js

...

This commit is contained in:

Oliver Walters

2020-10-30 22:44:25 +11:00

parent 90cfb3496a ad90adbc04

commit 3a702266e6

20 changed files with 1467 additions and 1132 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

InvenTree/locale/de/LC_MESSAGES/django.mo

Binary file not shown.

664

InvenTree/locale/de/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff