mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 05:39:02 +09: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. |
||
|---|---|---|
| .. | ||
| _theme.html.haml | ||
| admin.html.haml | ||
| application.html.haml | ||
| auth.html.haml | ||
| embedded.html.haml | ||
| error.html.haml | ||
| mailer.html.haml | ||
| mailer.text.erb | ||
| modal.html.haml | ||
| plain_mailer.html.haml | ||
| public.html.haml | ||