diff .svn/pristine/03/033d037b8655e755ff07ebfb8102a3786ab52ea0.svn-base @ 940:9fda6880be81 cannam

Merge from the default branch
author Chris Cannam
date Wed, 11 Jul 2012 14:35:59 +0100
parents cbb26bc654de
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/03/033d037b8655e755ff07ebfb8102a3786ab52ea0.svn-base	Wed Jul 11 14:35:59 2012 +0100
@@ -0,0 +1,2 @@
+<p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p>
+<p><%= link_to h(@url), @url %></p>