kikito 9e1581656a merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

..

base_controller.rb

Moves the layout to admin::BaseController and moderation::BaseController

2015-08-17 13:20:52 +02:00

comments_controller.rb

adds moderation to comments and debates [#136]

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

dashboard_controller.rb

merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

debates_controller.rb

adds moderation to comments and debates [#136]

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