Skip to content

Commit

Permalink
Merge branch '4.4' into 4.5
Browse files Browse the repository at this point in the history
# Conflicts:
#	lang/en.yml
  • Loading branch information
GuySartorelli committed Nov 27, 2023
2 parents 8bec110 + d66b001 commit 9e4b0bc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lang/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ en:
ASSERTLOGINBUTTON: 'Share your details with {orgname}'
AUTHENTICATOR_NAME: 'RealMe Account'
LOGINBUTTON: Login
LOGINBUTTON2: Log in
LOGINBUTTON2: 'Log in'
SilverStripe\RealMe\Authenticator\LoginHandler:
LOGINFAILURE: 'Unfortunately we''re not able to log you in through RealMe right now. Please try again shortly.'
SilverStripe\RealMe\Authenticator\MiniLoginForm:
Expand Down

0 comments on commit 9e4b0bc

Please sign in to comment.