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