mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 22:59:46 +09:00
bceb45adda
Conflicts: - `app/javascript/entrypoints/common.js`: Upstream moved everything from `app/javascript/packs` to `app/javascript/entrypoints` while this file was a glitch-soc addition. Moved it like the rest. - `tsconfig.json`: Conflict due to glitch-soc's flavor. Updated like upstream. Also moved and updated the following files accordingly: - `app/javascript/flavours/vanilla/theme.yml` - `app/javascript/flavours/glitch/theme.yml` - everything in `app/javascript/flavours/glitch/packs`
4 lines
60 B
JavaScript
4 lines
60 B
JavaScript
import '@/styles/mailer.scss';
|
|
|
|
require.context('@/icons');
|