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:
maxwell 2010-11-17 22:06:08 -08:00
commit 5e375a30d8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/home/show.html.haml
View file

@ -15,7 +15,7 @@
#login_field.section
already have an account?
= link_to "log in here", "#"
= link_to "log in here", new_user_session_path
.span-24.last{:style=>"text-align:center;"}
%ul#press_logos

10
config/locales/diaspora/en.yml
View file

@ -52,11 +52,11 @@ en:
invalid_fields: "Invalid Fields"
correct_the_following_errors_and_try_again: "Correct the following errors and try again."
layouts:
application:
view_profile: "view profile"
edit_profile: "edit profile"
account_settings: "account settings"
logout: "logout"
header:
view_profile: "view profile"
edit_profile: "edit profile"
account_settings: "account settings"
logout: "logout"
shared:
stream_element:
show_comments: "show comments"