Conflicts: - `app/javascript/packs/public.jsx`: In glitch-soc, this file was split across the following files: - `app/javascript/packs/public.jsx` - `app/javascript/core/embed.js` - `app/javascript/core/settings.js` Update all those files accordingly, as well as the related `theme.yml` files. |
||
---|---|---|
.. | ||
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 |