mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
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) |
||
---|---|---|
.. | ||
account_actions | ||
account_moderation_notes | ||
account_warnings | ||
accounts | ||
action_logs | ||
change_emails | ||
custom_emojis | ||
dashboard | ||
domain_allows | ||
domain_blocks | ||
email_domain_blocks | ||
followers | ||
instances | ||
invites | ||
pending_accounts | ||
relays | ||
report_notes | ||
reports | ||
settings | ||
statuses | ||
tags | ||
warning_presets |