Skip to content
Snippets Groups Projects
Unverified Commit 0a59f977 authored by David Robertson's avatar David Robertson
Browse files

Merge branch 'release-v1.55' into develop

parents 1530cef1 6134b307
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
changelog.d/12260.misc 0 → 100644
+ 1
− 0
View file @ 0a59f977
Reword 'Choose your user name' as 'Choose your account name' in the SSO registration template, in order to comply with SIWA guidelines.
\ No newline at end of file
synapse/res/templates/sso_auth_account_details.html
+ 1
− 1
View file @ 0a59f977
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
</head> </head>
<body> <body>
<header> <header>
<h1>Choose your user name</h1> <h1>Choose your account name</h1>
<p>This is required to create your account on {{ server_name }}, and you can't change this later.</p> <p>This is required to create your account on {{ server_name }}, and you can't change this later.</p>
</header> </header>
<main> <main>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment