kikito 9e1581656a merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

..

activerecord.en.yml

merges master and fixes conflicts

2015-08-17 02:40:11 +02:00

activerecord.es.yml

merges master and fixes conflicts

2015-08-17 02:40:11 +02:00

admin.en.yml

merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

admin.es.yml

merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

devise_views.en.yml

merges master and fixes conflicts

2015-08-17 02:40:11 +02:00

devise_views.es.yml

merges master and fixes conflicts

2015-08-17 02:40:11 +02:00

devise.en.yml

adds devise configuration [#6]

2015-07-16 19:47:54 +02:00

devise.es.yml

adds devise spanish translations

2015-07-17 19:52:54 +02:00

en.yml

merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

es.yml

merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

moderation.en.yml

Moves organization verification to Admin from Moderation

2015-08-17 13:22:38 +02:00

moderation.es.yml

Moves organization verification to Admin from Moderation

2015-08-17 13:22:38 +02:00

rails.en.yml

uses simple_captcha instead of recaptcha [#51]

2015-08-10 20:24:56 +02:00

rails.es.yml

uses simple_captcha instead of recaptcha [#51]

2015-08-10 20:24:56 +02:00

responders.en.yml

tests featured tags administration and adding featured tags to debates

2015-08-15 19:38:42 +02:00

responders.es.yml

tests featured tags administration and adding featured tags to debates

2015-08-15 19:38:42 +02:00

social_share_button.en.yml

Share in social networks

2015-08-10 11:00:39 -05:00

social_share_button.es.yml

Share in social networks

2015-08-10 11:00:39 -05:00