1d1c3a808a
Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed. |
||
|---|---|---|
| .. | ||
| 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 | ||