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 |
||
|---|---|---|
| .. | ||
| migrate | ||
| seeds | ||
| schema.rb | ||
| seeds.rb | ||