2 commits

Author	SHA1	Message	Date
Matt Jankowski	4c85fec993	[Glitch] Remove font-awesome npm package ... Port 4c4bcad866 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-08-20 18:49:56 +02:00
Claire	bceb45adda	Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream ... 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`	2024-05-04 14:59:00 +02:00