kikito fc4e67824b Merge branch 'master' into debates_description_html ...

I removed the truncation from debates.description because
debates.description returns html

Conflicts:
	app/views/debates/_debate.html.erb
	app/views/debates/show.html.erb

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

..

account_spec.rb

fixing conflicts [#47] [#47]

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

comments_spec.rb

adds i18n to comments_helper

2015-07-31 15:13:00 +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

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

fixes specs [#47]

2015-07-28 20:53:09 +02:00