1af945de11
Conflicts: Gemfile Gemfile.lock app/models/app_config.rb app/models/post.rb db/schema.rb public/stylesheets/sass/application.sass spec/lib/webfinger_spec.rb |
||
|---|---|---|
| .. | ||
| diaspora | ||
| postzord | ||
| 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 | ||