mirror of
https://github.com/funamitech/mastodon
synced 2024-12-15 07:09:03 +09:00
694c073d1f
Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. |
||
---|---|---|
.. | ||
action_bar.js | ||
autosuggest_account.js | ||
character_counter.js | ||
compose_form.js | ||
emoji_picker_dropdown.js | ||
navigation_bar.js | ||
poll_button.js | ||
poll_form.js | ||
privacy_dropdown.js | ||
reply_indicator.js | ||
search_results.js | ||
search.js | ||
text_icon_button.js | ||
upload_button.js | ||
upload_form.js | ||
upload_progress.js | ||
upload.js | ||
warning.js |