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

2020-10-29 15:23:51 +11:00

parent 05ce17f8df a148cfe593

commit 90cfb3496a

15 changed files with 1001 additions and 732 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.

541

InvenTree/locale/de/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff