diaspora/app/views/devise/mailer/confirmation_instructions.html.haml at 1481056af23ed7dd70eed73a847d40fbe2d3ba2d - nocebo/diaspora - myriad git: awawa?

nocebo/diaspora

Alec Leamas 1481056af2 Revert "Merge remote branch 'upstream/master'"

This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb

2010-10-20 14:59:55 +02:00

4 lines

204 B

Text

Raw Blame History

 %p
   Welcome #{@resource.email}!
 %p You can confirm your account through the link below:
 %p= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)