mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 15:44:56 +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. |
||
---|---|---|
.. | ||
about.js | ||
common.js | ||
error.js | ||
home.js | ||
public.js | ||
settings.js | ||
share.js |