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

..

assets

Changes styles for debates index and debate show

2015-08-04 13:25:00 +02:00

controllers

adds first 3 debates as featured_debates

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

helpers

adds i18n to comments_helper

2015-07-31 15:13:00 +02:00

mailers

initial commit

2015-07-15 13:32:13 +02:00

models

Make debate.description always html_safe

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

views

Merge branch 'master' into debates_description_html

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