mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 07:34:58 +01:00
9101254d0a
Conflicts: - `app/javascript/packs/public.js`: Upstream modified code that we split between multiple files due to glitch-soc's theming system. Ported those changes. |
||
---|---|---|
.. | ||
actions | ||
components | ||
containers | ||
features | ||
images | ||
locales | ||
middleware | ||
packs | ||
reducers | ||
selectors | ||
store | ||
styles | ||
util | ||
names.yml | ||
theme.yml |