Merge branch 'develop_translate_backend' into develop

Browse Source

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

...

This commit is contained in:

Kaibu

2021-11-04 14:55:09 +01:00

parent 4c87440691 8041e092f7

commit 04822103c3

1 changed files with 549 additions and 642 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

1191

cookbook/locale/de/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff