kikito b28f63b016 merges master and fixes conflicts

2015-08-18 09:35:13 +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

officials_spec.rb

adds edition/management of officials to admin zone

2015-08-17 17:04:29 +02:00

organizations_spec.rb

adds filters to admin/organizations

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

settings_spec.rb

adds settings area to admin

2015-08-17 18:38:57 +02:00