Merge branch 'master' into test

Browse Source

# Conflicts:
#	locale/de/LC_MESSAGES/django.mo
#	locale/de/LC_MESSAGES/django.po

...

This commit is contained in:

mpeltriaux committed 2023-08-30 09:12:02 +02:00

2 parents a2b44a9c45 1437d16092

commit e9086cbbcd

13 files changed

+170 -299

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

locale/de/LC_MESSAGES/django.mo

BIN

Binary file not shown.

locale/de/LC_MESSAGES/django.po

+11 -271

File diff suppressed because it is too large. Load diff