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 |
||
|---|---|---|
| .. | ||
| _debug.haml | ||
| _header.html.haml | ||
| application.html.haml | ||
| application.mobile.haml | ||
| notifier.html.haml | ||
| notifier.text.haml | ||
| popup.html.haml | ||