mirror of
https://github.com/funamitech/mastodon
synced 2024-12-11 21:29:17 +09:00
b9f7bc149b
Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb |
||
---|---|---|
.. | ||
account.js | ||
attachment_list.js | ||
autosuggest_textarea.js | ||
avatar_overlay.js | ||
avatar.js | ||
button.js | ||
collapsable.js | ||
column_back_button_slim.js | ||
column_back_button.js | ||
column_header.js | ||
column.js | ||
display_name.js | ||
dropdown_menu.js | ||
extended_video_player.js | ||
icon_button.js | ||
intersection_observer_article.js | ||
load_more.js | ||
loading_indicator.js | ||
media_gallery.js | ||
missing_indicator.js | ||
permalink.js | ||
relative_timestamp.js | ||
scrollable_list.js | ||
setting_text.js | ||
status_action_bar.js | ||
status_content.js | ||
status_list.js | ||
status.js | ||
video_player.js |