Juanjo Bazán af0698da35 fixes conflicts

2015-08-07 10:12:58 +02:00

..

debate_spec.rb

Make debate.description always html_safe

2015-08-04 18:42:49 +02:00

user_spec.rb

fixes conflicts

2015-08-07 10:12:58 +02:00