mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 06:38:39 +09: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. |
||
---|---|---|
.. | ||
_mixins.scss | ||
about.scss | ||
accessibility.scss | ||
accounts.scss | ||
admin.scss | ||
basics.scss | ||
branding.scss | ||
components.scss | ||
containers.scss | ||
dashboard.scss | ||
emoji_picker.scss | ||
forms.scss | ||
lists.scss | ||
modal.scss | ||
polls.scss | ||
reset.scss | ||
rich_text.scss | ||
rtl.scss | ||
statuses.scss | ||
tables.scss | ||
variables.scss | ||
widgets.scss |