Merge remote-tracking branch 'origin/recaptcha'

Browse Source

# Conflicts:
#	public/mix-manifest.json
#	src/Domain/Settings/Controllers/StoreSocialServiceCredentialsController.php

...

This commit is contained in:

Čarodej

2022-01-25 16:29:37 +01:00

parent 630cefee41 995319cfe5

commit 3d32e8f7e0

17 changed files with 223 additions and 10 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

public/assets/others/recaptcha.svg

+12

File diff suppressed because one or more lines are too long

Side by Side After Width:  |  Height:  |  Size: 12 KiB