mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-13 19:54:01 -05: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 |
||
---|---|---|
.. | ||
activitypub | ||
ostatus | ||
settings | ||
application_extension.rb | ||
emoji.rb | ||
exceptions.rb | ||
extractor.rb | ||
feed_manager.rb | ||
formatter.rb | ||
frontmatter_handler.rb | ||
hash_object.rb | ||
inline_renderer.rb | ||
language_detector.rb | ||
provider_discovery.rb | ||
request.rb | ||
sanitize_config.rb | ||
status_filter.rb | ||
status_finder.rb | ||
tag_manager.rb | ||
user_settings_decorator.rb | ||
webfinger_resource.rb |