Oliver Walters d06b4d7c9f Merge remote-tracking branch 'inventree/master' into build-fixes ...

# Conflicts:
#	InvenTree/InvenTree/urls.py
#	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/part/templates/part/bom.html
#	InvenTree/templates/js/build.js
#	InvenTree/templates/js/table_filters.js
#	InvenTree/templates/stock_table.html
#	tasks.py

2020-10-28 22:25:14 +11:00

..

barcode.js

Rename javascript files from .html to .js

2020-10-28 18:13:02 +11:00

bom.js

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

2020-10-28 22:25:14 +11:00

build.js

Rename javascript files from .html to .js

2020-10-28 18:13:02 +11:00

company.js

Rename javascript files from .html to .js

2020-10-28 18:13:02 +11:00

order.js

Rename javascript files from .html to .js

2020-10-28 18:13:02 +11:00

part.js

Rename javascript files from .html to .js

2020-10-28 18:13:02 +11:00

stock.js

Rename javascript files from .html to .js

2020-10-28 18:13:02 +11:00

table_filters.js

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

2020-10-28 22:25:14 +11:00