diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
| commit | 89a9d629f776a3a115c1e89ee4c13e8cbe7ae684 (patch) | |
| tree | c5da0f86e23fbd544dea6bcef124c41803c841ef /app/views/user_mailer/confirmation_instructions.no.html.erb | |
| parent | 0c7dc6c78123728a9a0a32e16c2ad524e76926c8 (diff) | |
| parent | 5276c0a0900a0886b59a8ead2346540aa381ea46 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: Gemfile.lock
Diffstat (limited to 'app/views/user_mailer/confirmation_instructions.no.html.erb')
| -rw-r--r-- | app/views/user_mailer/confirmation_instructions.no.html.erb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/app/views/user_mailer/confirmation_instructions.no.html.erb b/app/views/user_mailer/confirmation_instructions.no.html.erb deleted file mode 100644 index 366d9a4d3..000000000 --- a/app/views/user_mailer/confirmation_instructions.no.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -<p>Velkommen <%= @resource.email %> !</p> - -<p>Du har akkurat opprettet en konto på <%= @instance %>.</p> - -<p>For å bekrefte innskriving i manntallet vennligst trykk på følgende lenke : <br> -<%= link_to 'Bekreft min bruker', confirmation_url(@resource, confirmation_token: @token) %> - -<p>Vennligst også les våre <%= link_to 'brukervilkår', terms_url %>.</p> - -<p>Med vennlig hilsen,<p> - -<p>Gjengen bak <%= @instance %> </p> |