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
..
django.mo	Disable wrapping for translation files	2021-05-05 17:34:35 +10:00
django.po	Fix: New translations django.po from Crowdin	2021-06-01 20:22:42 +10:00