kikito cb99996317 merges master and fix conflicts

2015-08-28 13:23:30 +02:00

..

_admin_header.html.erb

Adds new texts on header, debates and footer

2015-08-27 16:46:47 +02:00

_footer.html.erb

Adds new texts on header, debates and footer

2015-08-27 16:46:47 +02:00

_header.html.erb

merges master and fix conflicts

2015-08-28 13:23:30 +02:00

admin.html.erb

Adds styles for admin

2015-08-17 21:30:22 +02:00

application.html.erb

Fix conflicts

2015-08-17 21:08:15 +02:00

devise.html.erb

uses simple_captcha instead of recaptcha [#51]

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

mailer.html.erb

Adds styles to comment and reply emails

2015-08-26 18:51:29 +02:00