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` |
||
|---|---|---|
| .. | ||
| __mocks__ | ||
| entrypoints | ||
| flavours | ||
| fonts | ||
| hooks | ||
| icons | ||
| images | ||
| mastodon | ||
| material-icons | ||
| skins | ||
| styles | ||
| svg-icons | ||
| types | ||