rgarcia cc3f151914 fixing conflicts

2015-07-27 23:29:32 +02:00

..

_debate.html.erb

Improves styles for debates home

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

_form.html.erb

adds recaptcha verification to debates

2015-07-27 18:44:33 +02:00

edit.html.erb

Basic CRU operations [#5]

2015-07-16 19:22:20 +02:00

index.html.erb

Improves styles for debates home

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

new.html.erb

Basic CRU operations [#5]

2015-07-16 19:22:20 +02:00

show.html.erb

fixes specs

2015-07-27 23:21:15 +02:00