You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire dc68306b8e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Conflicts due to glitch-soc's theming system. Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code. - `app/views/layouts/embedded.html.haml`: Conflicts due to glitch-soc's theming system. Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.		1 year ago
..
player.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago