60a60733df
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 |
||
|---|---|---|
| .. | ||
| controllers | ||
| helpers | ||
| mailers | ||
| models | ||
| uploaders | ||
| views | ||