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 |
||
|---|---|---|
| .. | ||
| diaspora | ||
| postzord | ||
| app_config_spec.rb | ||
| direction_detector_spec.rb | ||
| encryptor_spec.rb | ||
| fake_spec.rb | ||
| hcard_spec.rb | ||
| pubsubhubbub_spec.rb | ||
| rake_helper_spec.rb | ||
| resque_job_logging_spec.rb | ||
| salmon_salmon_spec.rb | ||
| splunk_logging_spec.rb | ||
| web_hooks_spec.rb | ||
| webfinger_profile_spec.rb | ||
| webfinger_spec.rb | ||
| youtube_titles_spec.rb | ||