1159490f00
Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”. |
||
|---|---|---|
| .. | ||
| actions | ||
| components | ||
| containers | ||
| features | ||
| locales | ||
| middleware | ||
| reducers | ||
| selectors | ||
| service_worker | ||
| storage | ||
| store | ||
| utils | ||
| .gitkeep | ||
| api.js | ||
| base_polyfills.js | ||
| common.js | ||
| compare_id.js | ||
| extra_polyfills.js | ||
| initial_state.js | ||
| is_mobile.js | ||
| link_header.js | ||
| load_polyfills.js | ||
| main.js | ||
| performance.js | ||
| ready.js | ||
| rtl.js | ||
| scroll.js | ||
| settings.js | ||
| stream.js | ||
| test_setup.js | ||
| uuid.js | ||