mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-28 04:49:11 +00:00
077183a121
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change. |
||
|---|---|---|
| .. | ||
| _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 | ||