mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-16 23:22:01 +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 |
||
|---|---|---|
| .. | ||
| fonts | ||
| _mixins.scss | ||
| about.scss | ||
| accounts.scss | ||
| admin.scss | ||
| application.scss | ||
| basics.scss | ||
| boost.scss | ||
| common.scss | ||
| compact_header.scss | ||
| components.scss | ||
| containers.scss | ||
| custom.scss | ||
| footer.scss | ||
| forms.scss | ||
| landing_strip.scss | ||
| lists.scss | ||
| reset.scss | ||
| rtl.scss | ||
| stream_entries.scss | ||
| tables.scss | ||
| variables-glitch.scss | ||
| variables.scss | ||