Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	local/modules/Recettes/I18n/fr_FR.php
#	templates/frontOffice/custom/recette.html

...

This commit is contained in:

TheCoreDev

2021-05-05 23:09:15 +02:00

parent 0790ae40ba db09da198a

commit 940e71289c

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

Diff Content Not Available