Juanjo Bazán 358028c3e6 Fixes conflicts. Merge branch 'master' into ancestry

2015-09-03 16:37:28 +02:00

..

abilities_helper.rb

adds moderation to comments and debates [#136]

2015-08-17 13:39:31 +02:00

admin_helper.rb

removes official_level_0_name setting

2015-09-01 20:00:41 +02:00

application_helper.rb

makes spaces consistent

2015-09-03 01:29:46 +02:00

cache_keys_helper.rb

makes spaces consistent

2015-09-03 01:29:46 +02:00

comments_helper.rb

uses ancestry to retrieve debate comments

2015-09-03 16:32:54 +02:00

flags_helper.rb

makes spaces consistent

2015-09-03 01:29:46 +02:00

stats_helper.rb

makes spaces consistent

2015-09-03 01:29:46 +02:00

verification_helper.rb

adds mask to verified emails and phones

2015-08-30 15:14:23 +02:00

votes_helper.rb

Renames @voted_values to @debate_votes in controllers

2015-09-01 13:07:03 +02:00