Oliver 7a7684b018 Merge branch 'l10' ... # Conflicts: # InvenTree/locale/de/LC_MESSAGES/django.po # InvenTree/locale/el/LC_MESSAGES/django.po # InvenTree/locale/en/LC_MESSAGES/django.po # InvenTree/locale/es/LC_MESSAGES/django.po # InvenTree/locale/fr/LC_MESSAGES/django.po # InvenTree/locale/he/LC_MESSAGES/django.po # InvenTree/locale/id/LC_MESSAGES/django.po # InvenTree/locale/it/LC_MESSAGES/django.po # InvenTree/locale/ja/LC_MESSAGES/django.po # InvenTree/locale/ko/LC_MESSAGES/django.po # InvenTree/locale/nl/LC_MESSAGES/django.po # InvenTree/locale/no/LC_MESSAGES/django.po # InvenTree/locale/pl/LC_MESSAGES/django.po # InvenTree/locale/ru/LC_MESSAGES/django.po # InvenTree/locale/sv/LC_MESSAGES/django.po # InvenTree/locale/th/LC_MESSAGES/django.po # InvenTree/locale/tr/LC_MESSAGES/django.po # InvenTree/locale/vi/LC_MESSAGES/django.po # InvenTree/locale/zh/LC_MESSAGES/django.po		2021-09-13 10:15:08 +10:00
..
barcodes	removes all lines consisting only of spaces	2021-05-06 12:11:38 +02:00
build	Unit test fixes	2021-09-07 22:27:39 +10:00
common	replace i html tags	2021-09-02 00:18:47 +02:00
company	replace i html tags	2021-09-02 00:18:47 +02:00
InvenTree	Merge branch 'l10'	2021-09-13 10:15:08 +10:00
label	Add inline option for reports, too	2021-08-07 22:28:48 +10:00
locale	Merge remote-tracking branch 'inventree/l10_crowdin' into l10	2021-09-13 10:01:45 +10:00
order	bug fix	2021-09-08 14:14:14 +10:00
part	Add version related tags	2021-09-12 23:13:55 +10:00
plugins	removes all lines consisting only of spaces	2021-05-06 12:11:38 +02:00
report	replace i html tags	2021-09-02 00:18:47 +02:00
script	script to save the locale stats	2021-08-05 00:44:02 +02:00
stock	Unit test fixes	2021-09-07 22:27:39 +10:00
templates	Add version related tags	2021-09-12 23:13:55 +10:00
users	ruleset	2021-07-22 23:39:36 +02:00
config_template.yaml	Merge branch 'master' of https://github.com/inventree/InvenTree into part-import	2021-06-18 23:10:59 +02:00
gunicorn.conf.py
manage.py