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

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

parent 7430a239a5 454805608c

commit 777b7a929d

13 changed files with 170 additions and 299 deletions

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

BIN

locale/de/LC_MESSAGES/django.mo

Binary file not shown.

282

locale/de/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff