Oliver 35b3bc73cc Merge remote-tracking branch 'inventree/master' into partial-shipment ... # Conflicts: # InvenTree/order/api.py		2021-12-04 09:35:54 +11:00
..
InvenTree	Merge remote-tracking branch 'inventree/master' into partial-shipment	2021-12-04 09:35:54 +11:00
barcodes	removes all lines consisting only of spaces	2021-05-06 12:11:38 +02:00
build	Merge remote-tracking branch 'inventree/master' into partial-shipment	2021-12-02 23:58:52 +11:00
common	[FR] Confirm to W293	2021-11-23 00:28:23 +01:00
company	Merge branch 'master' into partial-shipment	2021-12-02 20:49:13 +11:00
label	[FR] Confirm to W293	2021-11-23 00:28:23 +01:00
locale	Translations merge (#2395)	2021-12-01 09:20:11 +11:00
order	Merge remote-tracking branch 'inventree/master' into partial-shipment	2021-12-04 09:35:54 +11:00
part	Merge remote-tracking branch 'inventree/master' into partial-shipment	2021-12-04 09:35:54 +11:00
plugins	removes all lines consisting only of spaces	2021-05-06 12:11:38 +02:00
report	[FR] Confirm to W293	2021-11-23 00:28:23 +01:00
script	script to save the locale stats	2021-08-05 00:44:02 +02:00
stock	Merge remote-tracking branch 'inventree/master' into partial-shipment	2021-12-02 23:58:52 +11:00
templates	Merge remote-tracking branch 'inventree/master' into partial-shipment	2021-12-04 09:35:54 +11:00
users	Merge branch 'master' into partial-shipment	2021-11-29 22:59:36 +11:00
config_template.yaml	add aditional provider settings	2021-09-07 23:55:11 +02:00
gunicorn.conf.py	PEP fix	2020-12-14 10:44:38 +11:00
manage.py	…