update with changes from Production branch

2014-02-17 12:05:39 -05:00
parent 5b640cf9d8
commit a4937fb2e5
384 changed files with 14690 additions and 2242 deletions
--- a/app/views/mailer/password_reset.html.erb
+++ b/app/views/mailer/password_reset.html.erb
@ -5,13 +5,13 @@
  </head>
  <body>
    <p>
-			<%= t(:password_reset_message1) %>
-			<br />
-			<%= t(:password_reset_message2) %>
-			<br />
-			<%= t(:password_reset_message3) %>
-			<br /><br />
-			<a href="<%= @webpage %>"><%= @webpage %></a>
+      <%= t(:password_reset_message1) %>
+      <br />
+      <%= t(:password_reset_message2) %>
+      <br />
+      <%= t(:password_reset_message3) %>
+      <br /><br />
+      <a href="<%= @webpage %>"><%= @webpage %></a>
    </p>
  </body>
 </html>