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 |
||
|---|---|---|
| .. | ||
| attack_vectors_spec.rb | ||
| connecting_spec.rb | ||
| invite_spec.rb | ||
| posting_spec.rb | ||
| querying_spec.rb | ||