Merge remote-tracking branch 'weblate/master'
Conflicts: locale/pt_BR/LC_MESSAGES/django.po locale/zh_CN/LC_MESSAGES/django.po locale/zh_CN/LC_MESSAGES/djangojs.po locale/zh_TW/LC_MESSAGES/django.po
Showing
This diff is collapsed.
Please register or sign in to comment