kikito 9e1581656a merges master and fixes conflicts

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

..

comments_spec.rb

adds specs for moderation [#136]

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

debates_spec.rb

adds specs for moderation [#136]

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

organizations_spec.rb

adds filters to admin/organizations

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