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

Conflicts:
	app/controllers/application_controller.rb

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

..

account_spec.rb

fixing conflicts [#47] [#47]

2015-07-30 18:19:38 +02:00

comments_spec.rb

hides comment forms from not logged users

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

debates_spec.rb

Merge branch 'master' into debates_description_html

2015-08-04 19:07:20 +02:00

home_spec.rb

fixes specs

2015-07-27 11:15:20 +02:00

localization_spec.rb

Allow locale to be set through the front-end

2015-08-05 15:43:39 -05:00

tags_spec.rb

adds first 3 debates as featured_debates

2015-08-04 18:41:09 +02:00

users_spec.rb

adds spec step to confirm email after sign up

2015-07-31 15:44:08 +02:00

votes_spec.rb

adds spec for voting a featured debate [#25]

2015-08-05 13:50:15 +02:00