mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 04:43:24 +00:00
92c06a1113
Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line. |
||
|---|---|---|
| .. | ||
| account_moderation_note_policy_spec.rb | ||
| account_policy_spec.rb | ||
| backup_policy_spec.rb | ||
| custom_emoji_policy_spec.rb | ||
| domain_block_policy_spec.rb | ||
| email_domain_block_policy_spec.rb | ||
| instance_policy_spec.rb | ||
| invite_policy_spec.rb | ||
| relay_policy_spec.rb | ||
| report_note_policy_spec.rb | ||
| report_policy_spec.rb | ||
| settings_policy_spec.rb | ||
| status_policy_spec.rb | ||
| tag_policy_spec.rb | ||
| user_policy_spec.rb | ||