Merge branch 'spelling-error' of /home/git/repositories/gitlab/gitlabhq

003f18c2 · Dmitriy Zaporozhets · e79f757f · 67a3dc4e · 003f18c2 · 003f18c2
Commit 003f18c2 authored May 29, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/views/notify/new_user_email.html.haml app/views/notify/new_user_email.html.haml +1 -1

app/views/notify/new_user_email.text.erb app/views/notify/new_user_email.text.erb +1 -1

No files found.
--- a/app/views/notify/new_user_email.html.haml
+++ b/app/views/notify/new_user_email.html.haml
@@ -14,7 +14,7 @@
    %code= @password

 %p
-  Please change your password immediatly after login.
+  Please change your password immediately after login.

 %p
  = link_to "Click here to login", root_url
--- a/app/views/notify/new_user_email.text.erb
+++ b/app/views/notify/new_user_email.text.erb
@@ -7,6 +7,6 @@ login.................. <%= @user.email %>
  password............... <%= @password %>
 <% end %>

-Please change your password immediatly after login.
+Please change your password immediately after login.

 Click here to login: <%= url_for(root_url) %>