kikito 3ab579999e merges with master and fixes conflicts

2015-10-20 16:28:22 +02:00

..

abilities

…

ahoy

…

verification/management

…

activity_spec.rb

…

comment_spec.rb

…

debate_spec.rb

…

flag_spec.rb

…

identity_spec.rb

…

letter_spec.rb

…

lock_spec.rb

…

organization_spec.rb

…

proposal_spec.rb

…

residence_spec.rb

…

setting_spec.rb

…

sms_spec.rb

…

user_spec.rb

…

vote_spec.rb

…