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 |
||
|---|---|---|
| .. | ||
| application_helper.rb | ||
| aspects_helper.rb | ||
| conversations_helper.rb | ||
| error_messages_helper.rb | ||
| language_helper.rb | ||
| layout_helper.rb | ||
| likes_helper.rb | ||
| mobile_helper.rb | ||
| notifications_helper.rb | ||
| people_helper.rb | ||
| publics_helper.rb | ||
| requests_helper.rb | ||
| sockets_helper.rb | ||
| status_messages_helper.rb | ||
| stream_helper.rb | ||
| users_helper.rb | ||