Conflicts: app/controllers/aspects_controller.rb app/controllers/home_controller.rb app/helpers/application_helper.rb db/migrate/20110201013408_add_open_aspects_to_user.rb spec/controllers/aspects_controller_spec.rb spec/controllers/home_controller_spec.rb |
||
|---|---|---|
| .. | ||
| application_helper.rb | ||
| aspects_helper.rb | ||
| error_messages_helper.rb | ||
| language_helper.rb | ||
| layout_helper.rb | ||
| mobile_helper.rb | ||
| notifications_helper.rb | ||
| people_helper.rb | ||
| publics_helper.rb | ||
| requests_helper.rb | ||
| sockets_helper.rb | ||
| statistics_helper.rb | ||
| status_messages_helper.rb | ||
| stream_helper.rb | ||
| users_helper.rb | ||