mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 14:18:34 +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. |
||
---|---|---|
.. | ||
action_bar.jsx | ||
autosuggest_account.jsx | ||
character_counter.jsx | ||
compose_form.jsx | ||
edit_indicator.jsx | ||
emoji_picker_dropdown.jsx | ||
language_dropdown.jsx | ||
navigation_bar.jsx | ||
poll_button.jsx | ||
poll_form.jsx | ||
privacy_dropdown.jsx | ||
reply_indicator.jsx | ||
search_results.jsx | ||
search.jsx | ||
text_icon_button.jsx | ||
upload_button.jsx | ||
upload_form.jsx | ||
upload_progress.jsx | ||
upload.jsx | ||
warning.jsx |