mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-25 16:43:41 +01: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 |
||
---|---|---|
.. | ||
actions_modal.js | ||
boost_modal.js | ||
bundle.js | ||
bundle_column_error.js | ||
bundle_modal_error.js | ||
column.js | ||
column_header.js | ||
column_link.js | ||
column_loading.js | ||
column_subheading.js | ||
columns_area.js | ||
confirmation_modal.js | ||
embed_modal.js | ||
image_loader.js | ||
media_modal.js | ||
modal_loading.js | ||
modal_root.js | ||
onboarding_modal.js | ||
report_modal.js | ||
tabs_bar.js | ||
upload_area.js | ||
video_modal.js |