rgarcia cc3f151914 fixing conflicts

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

..

_comment.html.erb

adds comments to debates [#7]

2015-07-18 17:38:57 +02:00

_form.html.erb

fixing conflicts

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