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 |
||
|---|---|---|
| .. | ||
| facebook.rb | ||
| tumblr.rb | ||
| twitter.rb | ||
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 |
||
|---|---|---|
| .. | ||
| facebook.rb | ||
| tumblr.rb | ||
| twitter.rb | ||