kikito a4bc9ed08f removes conflict code which was left there by mistake

2015-07-29 18:45:10 +02:00

..

_debate.html.erb

removes hashrockets

2015-07-29 14:27:58 +02:00

_form.html.erb

fixing conflicts [#45]

2015-07-29 13:36:48 +02:00

edit.html.erb

adds i18n to debates' interface

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

index.html.erb

Improves styles for debates home

2015-07-27 21:20:20 +02:00

new.html.erb

adds i18n to debates' interface

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

show.html.erb

removes conflict code which was left there by mistake

2015-07-29 18:45:10 +02:00