Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
95fadf1300
InvenTree/InvenTree/locale
History
Oliver Walters 3a702266e6 Merge remote-tracking branch 'inventree/master' into build-fixes 
# Conflicts:
#	InvenTree/InvenTree/views.py
#	InvenTree/build/views.py
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/order/views.py
#	InvenTree/part/api.py
#	InvenTree/part/views.py
#	InvenTree/templates/js/bom.js
2020-10-30 22:44:25 +11:00
..
de/LC_MESSAGES Merge remote-tracking branch 'inventree/master' into build-fixes 2020-10-30 22:44:25 +11:00
en/LC_MESSAGES Merge remote-tracking branch 'inventree/master' into build-fixes 2020-10-30 22:44:25 +11:00
es/LC_MESSAGES Merge remote-tracking branch 'inventree/master' into build-fixes 2020-10-30 22:44:25 +11:00