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 |
||
|---|---|---|
| .. | ||
| _mixins.scss | ||
| application.sass | ||
| autocomplete.sass | ||
| login.scss | ||
| mobile.sass | ||
| popup.scss | ||
| rtl.sass | ||
| sessions.sass | ||
| tags.sass | ||
| ui.sass | ||