Conflicts: app/controllers/aspects_controller.rb app/controllers/contacts_controller.rb app/controllers/people_controller.rb app/controllers/photos_controller.rb app/controllers/tags_controller.rb app/helpers/notifications_helper.rb app/models/notifications/new_request.rb app/models/user_preference.rb public/javascripts/view.js spec/controllers/aspects_controller_spec.rb spec/controllers/contacts_controller_spec.rb spec/controllers/home_controller_spec.rb spec/controllers/post_visibilities_controller_spec.rb spec/controllers/requests_controller_spec.rb spec/mailers/notifier_spec.rb spec/models/user_spec.rb |
||
|---|---|---|
| .. | ||
| jobs | ||
| notifications | ||
| services | ||
| user | ||
| aspect_membership_spec.rb | ||
| aspect_spec.rb | ||
| comment_spec.rb | ||
| contact_spec.rb | ||
| conversation_spec.rb | ||
| invitation_spec.rb | ||
| like_spec.rb | ||
| mention_spec.rb | ||
| message_spec.rb | ||
| notification_spec.rb | ||
| person_spec.rb | ||
| photo_spec.rb | ||
| post_spec.rb | ||
| profile_spec.rb | ||
| relayable_retraction_spec.rb | ||
| request_spec.rb | ||
| retraction_spec.rb | ||
| service_spec.rb | ||
| service_user_spec.rb | ||
| status_message_spec.rb | ||
| user_preference_spec.rb | ||
| user_spec.rb | ||