mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-27 02:24:03 -05:00
dd2a991e24
Conflicts: - `app/javascript/material-icons/400-24px/code.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/javascript/material-icons/400-24px/mail.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/javascript/material-icons/400-24px/manufacturing.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/views/admin/settings/shared/_links.html.haml`: Glitch-soc had extra menu items, ported the changes for them too. - `config/navigation.rb`: Glitch-soc had extra menu items, ported the changes for them too. |
||
---|---|---|
.. | ||
admin | ||
accounts_helper_spec.rb | ||
application_helper_spec.rb | ||
flashes_helper_spec.rb | ||
formatting_helper_spec.rb | ||
home_helper_spec.rb | ||
instance_helper_spec.rb | ||
json_ld_helper_spec.rb | ||
languages_helper_spec.rb | ||
media_component_helper_spec.rb | ||
react_component_helper_spec.rb | ||
routing_helper_spec.rb | ||
self_destruct_helper_spec.rb | ||
settings_helper_spec.rb | ||
statuses_helper_spec.rb | ||
theme_helper_spec.rb |