mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 22:29:07 +09:00
c59fb65ddc
Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc. |
||
---|---|---|
.. | ||
_theme.html.haml | ||
admin_mailer.text.erb | ||
admin.html.haml | ||
application.html.haml | ||
auth.html.haml | ||
embedded.html.haml | ||
error.html.haml | ||
helper_frame.html.haml | ||
mailer.html.haml | ||
mailer.text.erb | ||
modal.html.haml |