Merge remote-tracking branch 'origin/recaptcha'

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

View File

@@ -68,6 +68,9 @@ GOOGLE_CLIENT_SECRET=
GITHUB_CLIENT_ID=
GITHUB_CLIENT_SECRET=
RECAPTCHA_CLIENT_ID=
RECAPTCHA_CLIENT_SECRET=
SANCTUM_STATEFUL_DOMAINS=localhost,localhost:8000,127.0.0.1,127.0.0.1:8000,::1
IS_ADMIN_VUEFILEMANAGER_BAR=true