consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merges master and fix conflicts

Browse Source
This commit is contained in:
kikito
2015-08-25 19:31:25 +02:00
parent 8bdf03c50d 44ec0cb76d
commit c183cf2cc6
41 changed files with 572 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/locales/en.yml
View File

@@ -148,3 +148,12 @@ en:
all: "You are not authorized to %{action} %{subject}."
welcome:
last_debates: Last debates
omniauth:
finish_signup:
title: Add Email
twitter:
sign_in: Sign in with Twitter
facebook:
sign_in: Sign in with Facebook
google_oauth2:
sign_in: Sign in with Google