c13682bc0d
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. |
||
---|---|---|
.. | ||
admin.js | ||
common.js | ||
embed.js | ||
mailer.js | ||
public.js | ||
settings.js | ||
theme.yml |