kikito 9e1581656a merges master and fixes conflicts

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

..

comments

adds moderation to comments and debates [#136]

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

dashboard

Implements dashboard controllers & views for admin & moderation

2015-08-07 17:20:28 +02:00

debates

adds moderation to comments and debates [#136]

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

organizations

adds filters to admin/organizations

2015-08-17 14:25:43 +02:00

tags

adds create and destroy to the tags CRUD

2015-08-15 20:01:52 +02:00

_menu.html.erb

merges master and fixes conflicts

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