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 |
||
|---|---|---|
| .. | ||
| _finder.html.haml | ||
| _remote_friend.html.haml | ||
| finder.html.haml | ||
| index.html.haml | ||
| tumblr.html.haml | ||