diff options
author | Surinna Curtis <ekiru.0@gmail.com> | 2017-09-10 14:10:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-10 14:10:30 -0500 |
commit | 7a9c7d4e0b694e716cb018e3057792b4d86026fa (patch) | |
tree | 973b16e23a7cbeaf5a43550444e54aa1ace50a46 /app/views/user_mailer/confirmation_instructions.oc.text.erb | |
parent | c9df53044a333276853f7dc7ef2aed6d48df087f (diff) | |
parent | 932571fa22273e6ff5c229147668c426b4d65326 (diff) |
Merge pull request #143 from yipdw/sync/upstream
Merge with upstream's 1.6.0
Diffstat (limited to 'app/views/user_mailer/confirmation_instructions.oc.text.erb')
-rw-r--r-- | app/views/user_mailer/confirmation_instructions.oc.text.erb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/user_mailer/confirmation_instructions.oc.text.erb b/app/views/user_mailer/confirmation_instructions.oc.text.erb index 444d296ce..bf2acfec1 100644 --- a/app/views/user_mailer/confirmation_instructions.oc.text.erb +++ b/app/views/user_mailer/confirmation_instructions.oc.text.erb @@ -1,13 +1,13 @@ -Bonjorn <%= @resource.email %> ! +Bonjorn <%= @resource.email %> ! Venètz de vos crear un compte sus <%= @instance %> e vos mercegem :) -er confirmar vòstre inscripcion, mercés de clicar sul ligam seguent : +er confirmar vòstra inscripcion, mercés de clicar sul ligam seguent : <%= link_to 'Confirmar mon compte', confirmation_url(@resource, confirmation_token: @token) %> Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina. -Pensatz tanben a gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>. +Pensatz tanben de gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>. Amistosament, |