Fernando Seror c4eb29f99d Merge branch 'master' into escoger_idioma_803 ...

Conflicts:
	app/controllers/application_controller.rb

2015-08-05 15:47:52 -05:00

..

features

Merge branch 'master' into escoger_idioma_803

2015-08-05 15:47:52 -05:00

helpers

fixes specs [#45]

2015-07-28 18:32:51 +02:00

lib

Adds TagSanitizer

2015-08-03 19:30:06 +02:00

models

Make debate.description always html_safe

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

factories.rb

fixes build

2015-08-04 17:56:38 +02:00

rails_helper.rb

integrates coveralls in test suite

2015-08-05 14:16:58 +02:00

spec_helper.rb

fixes conflicts [#21]

2015-07-27 21:55:43 +02:00