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 |
||
|---|---|---|
| .. | ||
| images | ||
| javascripts | ||
| stylesheets | ||
| well-known | ||
| 404.html | ||
| 422.html | ||
| 500.html | ||
| apple-touch-icon.png | ||
| crossdomain.xml | ||
| default.html | ||
| favicon.ico | ||
| favicon.png | ||
| robots.txt | ||