diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-09-09 23:56:21 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-09-09 23:56:21 -0500 |
| commit | 67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b (patch) | |
| tree | 011ea44fc94bcff6f8ec4e23c3edf887359243d2 /app/views/user_mailer/confirmation_instructions.oc.html.erb | |
| parent | 3dff74eecf5387b92b862893248710d2efb90eec (diff) | |
| parent | 90712d42933efd9978e4bbae82f81a4650aa4d84 (diff) | |
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
Diffstat (limited to 'app/views/user_mailer/confirmation_instructions.oc.html.erb')
| -rw-r--r-- | app/views/user_mailer/confirmation_instructions.oc.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/user_mailer/confirmation_instructions.oc.html.erb b/app/views/user_mailer/confirmation_instructions.oc.html.erb index 9e9732bd8..ed1428a55 100644 --- a/app/views/user_mailer/confirmation_instructions.oc.html.erb +++ b/app/views/user_mailer/confirmation_instructions.oc.html.erb @@ -1,8 +1,8 @@ -<p>Bonjorn <%= @resource.email %> !<p> +<p>Bonjorn <%= @resource.email %> ! <p> <p>Venètz de vos crear un compte sus <%= @instance %> e vos mercegem :)</p> -<p>Per confirmar vòstre inscripcion, mercés de clicar sul ligam seguent : <br> +<p>Per confirmar vòstre inscripcion, mercés de clicar sul ligam seguent : <br> <%= link_to 'Confirmar mon compte', confirmation_url(@resource, confirmation_token: @token) %></p> <p>Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina.</p> |