rgarcia ec6d34a49f fixes conflicts

2015-08-06 13:42:57 +02:00

..

_debate.html.erb

fixes conflicts

2015-08-06 13:42:57 +02:00

_featured_debate.html.erb

fixes conflicts

2015-08-06 13:42:57 +02:00

_form.html.erb

Adds styles for authentication pages

2015-07-30 19:51:33 +02:00

_votes.html.erb

fixes conflicts

2015-08-06 13:42:57 +02:00

edit.html.erb

adds i18n to debates' interface

2015-07-28 16:48:36 +02:00

index.html.erb

Updates styles for debates index

2015-08-06 11:19:37 +02:00

new.html.erb

adds i18n to debates' interface

2015-07-28 16:48:36 +02:00

show.html.erb

fixes conflicts

2015-08-06 13:42:57 +02:00

vote.js.erb

fixes conflicts

2015-08-06 13:42:57 +02:00