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

Browse Source

# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.mo
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/templates/js/bom.js

...

This commit is contained in:

Oliver Walters committed 2020-10-29 15:23:51 +11:00

2 parents 05ce17f8df a148cfe593

commit 90cfb3496a

15 files changed

+1001 -732

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

No files matched your search

InvenTree/locale/de/LC_MESSAGES/django.mo

BIN

Binary file not shown.

InvenTree/locale/de/LC_MESSAGES/django.po

+306 -235

File diff suppressed because it is too large. Load diff