21e3c2ae73
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 |
||
|---|---|---|
| .. | ||
| config | ||
| controllers | ||
| fixtures | ||
| helpers | ||
| intergration | ||
| javascripts | ||
| lib | ||
| mailers | ||
| models | ||
| shared_behaviors | ||
| support | ||
| factories.rb | ||
| helper_methods.rb | ||
| misc_spec.rb | ||
| spec_helper.rb | ||