mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 05:39:02 +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 |
||
|---|---|---|
| .. | ||
| accounts_counters.js | ||
| accounts.js | ||
| alerts.js | ||
| cards.js | ||
| compose.js | ||
| contexts.js | ||
| index.js | ||
| media_attachments.js | ||
| meta.js | ||
| modal.js | ||
| notifications.js | ||
| push_notifications.js | ||
| relationships.js | ||
| reports.js | ||
| search.js | ||
| settings.js | ||
| status_lists.js | ||
| statuses.js | ||
| timelines.js | ||
| user_lists.js | ||