nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/devise/mailer
History
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
..
confirmation_instructions.html.haml Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
invitation.html.haml Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
reset_password_instructions.html.haml Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
unlock_instructions.html.haml Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00