mirror of https://github.com/tootsuite/mastodon
74c5b2bd08
Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) |
||
|---|---|---|
| .. | ||
| _login.html.haml | ||
| _registration.html.haml | ||
| blocks.html.haml | ||
| more.html.haml | ||
| show.html.haml | ||
| terms.html.haml | ||