mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-21 23:22:56 -05: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`
5 lines
140 B
JavaScript
5 lines
140 B
JavaScript
/* Placeholder file to have `inert.scss` compiled by Webpack
|
|
This is used by the `wicg-inert` polyfill */
|
|
|
|
import '@/styles/inert.scss';
|