nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
Raphael 2010-11-08 11:38:49 -08:00
commit 38a1b948ed
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "pkg"]
path = pkg
url = git@github.com:diaspora/diaspora-packages.git
url = git://github.com/diaspora/diaspora-packages.git

2
app/views/devise/mailer/invitation.html.haml
View file

@ -52,7 +52,7 @@
- @resource.inviters.each do |inv|
- if @resource.invite_messages[inv.id.to_s]
= "#{inv.real_name}:"
= @resource.invite_messages[inv.id.to_s]
= "\"#{@resource.invite_messages[inv.id.to_s]}\""
%p
%p= link_to 'Accept invitation', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token), :class => "large_text"
%p.small