tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests 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 committed 2026-02-11 13:32:18 +01:00
2 parents 8d1bf0dda5 d13d7b4566
commit 4fbd1ad7ae
41 files changed
+372 -243
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/javascript/styles/contrast.scss
-1
View File
@@ -1 +0,0 @@
@use 'common';
app/javascript/styles/mastodon-light.scss
-1
View File
@@ -1 +0,0 @@
@use 'common';