Merge branch 'beta' into 'food_traceability'

Browse Source

# Conflicts:
#   locale/fr/LC_MESSAGES/django.po

...

This commit is contained in:

ehouarn

2025-07-11 17:00:45 +02:00

parent 5989721bc9 bcc3e7cc53

commit 79f50c27f1

57 changed files with 6078 additions and 1926 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

733

locale/fr/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff