grecia

Files

Alberto Garcia Cabeza 3fd8e76a79 Merge branch 'select_debates_which_display_as_featured' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-select_debates_which_display_as_featured

Conflicts:
	db/schema.rb

2016-04-05 14:05:27 +02:00

_actions.html.erb

Mark debates as featured

2016-03-20 13:56:05 +01:00

_comments.html.erb

Adds foundation 6 🎉

2016-02-26 19:33:33 +01:00

_debate.html.erb

2016-03-14 19:32:48 +01:00

_featured_debates.html.erb

Mark debates as featured

2016-03-20 13:56:05 +01:00

_flag_actions.html.erb

2016-03-14 19:32:48 +01:00

_form.html.erb

2016-03-14 19:32:49 +01:00

_refresh_flag_actions.js.erb

Several renamings

2015-08-27 10:48:49 +02:00

_votes.html.erb

2016-03-14 19:32:49 +01:00

edit.html.erb

2016-03-14 19:32:48 +01:00

index.html.erb

Mark debates as featured

2016-03-20 13:56:05 +01:00

map.html.erb

2016-01-25 22:28:46 +01:00

new.html.erb

2016-03-14 19:32:49 +01:00

show.html.erb

2016-04-04 20:56:29 +02:00

suggest.js.erb

2016-02-03 19:57:37 +01:00

vote.js.erb

fixes conflicts

2015-08-06 13:42:57 +02:00