Conflicts: app/controllers/application_controller.rb app/controllers/people_controller.rb app/models/person.rb config/assets.yml db/schema.rb public/javascripts/aspect-edit.js spec/controllers/aspects_controller_spec.rb spec/models/user/querying_spec.rb spec/spec_helper.rb |
||
|---|---|---|
| .. | ||
| base.rb | ||
| http_multi.rb | ||
| http_post.rb | ||
| invite_user_by_email.rb | ||
| mail_also_commented.rb | ||
| mail_comment_on_post.rb | ||
| mail_mentioned.rb | ||
| mail_private_message.rb | ||
| mail_started_sharing.rb | ||
| notify_local_users.rb | ||
| post_to_service.rb | ||
| process_photo.rb | ||
| publish_to_hub.rb | ||
| receive.rb | ||
| receive_local_batch.rb | ||
| receive_salmon.rb | ||
| resend_invitation.rb | ||
| socket_webfinger.rb | ||
| update_service_users.rb | ||