21e7a53ca5
Conflicts: - `package.json`: Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one were changed, but otherwise no real conflict. Ported upstream's changes and kept glitch-soc's `i18n:extract`. - `tsconfig.json`: Upstream's dependencies changed the code style rules for json formatting, and we had local changes. Kept our changes, but with upstream's formatting/ - `yarn.lock`: A dependency textually adjacent to a glitch-soc-only one got changed. Applied upstream's change, keeping the glitch-soc-only dependency. |
||
|---|---|---|
| .. | ||
| actions | ||
| api_types | ||
| components | ||
| containers | ||
| features | ||
| locales | ||
| models | ||
| polyfills | ||
| reducers | ||
| selectors | ||
| service_worker | ||
| store | ||
| utils | ||
| api.ts | ||
| blurhash.ts | ||
| common.js | ||
| compare_id.ts | ||
| initial_state.js | ||
| is_mobile.ts | ||
| load_keyboard_extensions.js | ||
| main.jsx | ||
| performance.js | ||
| permissions.ts | ||
| ready.js | ||
| scroll.ts | ||
| settings.js | ||
| stream.js | ||
| test_helpers.tsx | ||
| test_setup.js | ||
| uuid.ts | ||