Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 11:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream

Browse Source 
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.
This commit is contained in:
Claire
2026-02-11 13:32:18 +01:00
parent 8d1bf0dda5 d13d7b4566
commit 4fbd1ad7ae
41 changed files with 372 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/styles/contrast.scss
View File

@@ -1 +0,0 @@
@use 'common';

1
app/javascript/styles/mastodon-light.scss
View File

@@ -1 +0,0 @@
@use 'common';