diff .svn/pristine/03/033d037b8655e755ff07ebfb8102a3786ab52ea0.svn-base @ 926:b73a59a6acbd luisf

Merge from cannam_integration
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 11 May 2012 16:10:11 +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	Fri May 11 16:10:11 2012 +0100
@@ -0,0 +1,2 @@
+<p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p>
+<p><%= link_to h(@url), @url %></p>