mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-24 17:14:15 -05:00
1b06e4e1b7
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. |
||
---|---|---|
.. | ||
admin.tsx | ||
application.js | ||
common.js | ||
error.js | ||
public-path.js | ||
public.tsx | ||
share.jsx | ||
sign_up.js |