kikito c88f7c1f30 merges master and fixes conflicts

2015-08-23 20:27:11 +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

refactors user's registration

2015-08-21 16:41:08 +02:00

organizations_spec.rb

Refactors organization factories & admin controller

2015-08-22 19:46:28 +02:00

settings_spec.rb

adds settings area to admin

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

users_spec.rb

adds restore user action for administrators

2015-08-20 16:06:23 +02:00