mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-15 03:15:32 +00: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 |
||
---|---|---|
.. | ||
concerns | ||
form | ||
web | ||
account_domain_block_spec.rb | ||
account_filter_spec.rb | ||
account_spec.rb | ||
block_spec.rb | ||
conversation_mute_spec.rb | ||
conversation_spec.rb | ||
domain_block_spec.rb | ||
export_spec.rb | ||
favourite_spec.rb | ||
feed_spec.rb | ||
follow_request_spec.rb | ||
follow_spec.rb | ||
import_spec.rb | ||
media_attachment_spec.rb | ||
mention_spec.rb | ||
mute_spec.rb | ||
notification_spec.rb | ||
preview_card_spec.rb | ||
report_filter_spec.rb | ||
report_spec.rb | ||
session_activation_spec.rb | ||
status_pin_spec.rb | ||
status_spec.rb | ||
stream_entry_spec.rb | ||
subscription_spec.rb | ||
tag_spec.rb | ||
user_spec.rb |