diff .svn/pristine/a7/a79b96105a7a8c91d5e2c495661f62b448488b49.svn-base @ 927:9ee5fd0b9bd3

Merge from cannam_integration
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 11 May 2012 16:13:59 +0100
parents cbb26bc654de
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/a7/a79b96105a7a8c91d5e2c495661f62b448488b49.svn-base	Fri May 11 16:13:59 2012 +0100
@@ -0,0 +1,2 @@
+<%= l(:mail_body_account_activation_request, @user.login) %>
+<%= @url %>