Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	local/modules/ReCaptcha/templates/backOffice/default/recaptcha/configuration.html

...

This commit is contained in:

Laurent LE CORRE

2020-05-13 15:35:50 +02:00

parent 7de9f76c9e 170089d44c

commit 174fb6b861

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