mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-29 03:20:26 -05:00
f6654e0842
Conflicts: - `app/javascript/packs/admin.jsx`: This file was split between `app/javascript/core/admin.js`, `app/javascript/pack/admin.jsx`, and `app/javascript/flavours/glitch/packs/admin.jsx`. Ported upstream's change, splitting the new file to `app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`, and `app/javascript/flavours/glitch/packs/admin.tsx` |
||
---|---|---|
.. | ||
actions | ||
api_types | ||
components | ||
containers | ||
features | ||
hooks | ||
images | ||
locales | ||
models | ||
packs | ||
polyfills | ||
reducers | ||
selectors | ||
store | ||
styles | ||
types | ||
utils | ||
api.ts | ||
blurhash.ts | ||
compare_id.ts | ||
initial_state.js | ||
is_mobile.ts | ||
load_keyboard_extensions.js | ||
main.jsx | ||
names.yml | ||
performance.js | ||
permissions.ts | ||
ready.js | ||
scroll.ts | ||
settings.js | ||
stream.js | ||
test_helpers.tsx | ||
theme.yml | ||
uuid.ts |