Oliver 5377d860f4 Merge remote-tracking branch 'inventree/master' into l10-merge ... # Conflicts: # InvenTree/locale/de/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/it/LC_MESSAGES/django.po # InvenTree/locale/ja/LC_MESSAGES/django.po # InvenTree/locale/pl/LC_MESSAGES/django.po # InvenTree/locale/ru/LC_MESSAGES/django.po # InvenTree/locale/tr/LC_MESSAGES/django.po # InvenTree/locale/zh/LC_MESSAGES/django.po		2021-06-06 22:27:27 +10:00
..
de/LC_MESSAGES	Merge remote-tracking branch 'inventree/master' into l10-merge	2021-06-06 22:27:27 +10:00
en/LC_MESSAGES	updated translation base	2021-06-01 10:08:09 +00:00
es/LC_MESSAGES	Merge remote-tracking branch 'inventree/master' into l10-merge	2021-06-06 22:27:27 +10:00
fr/LC_MESSAGES	Merge remote-tracking branch 'inventree/master' into l10-merge	2021-06-06 22:27:27 +10:00
it/LC_MESSAGES	Merge remote-tracking branch 'inventree/master' into l10-merge	2021-06-06 22:27:27 +10:00
ja/LC_MESSAGES	Merge remote-tracking branch 'inventree/master' into l10-merge	2021-06-06 22:27:27 +10:00
pl/LC_MESSAGES	Merge remote-tracking branch 'inventree/master' into l10-merge	2021-06-06 22:27:27 +10:00
ru/LC_MESSAGES	Merge remote-tracking branch 'inventree/master' into l10-merge	2021-06-06 22:27:27 +10:00
tr/LC_MESSAGES	Fix: New translations django.po from Crowdin	2021-06-01 20:22:40 +10:00
zh/LC_MESSAGES	Merge remote-tracking branch 'inventree/master' into l10-merge	2021-06-06 22:27:27 +10:00