Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.
This commit is contained in:
Claire
2025-05-28 18:41:47 +02:00
parent a76647c406 ca41a95872
commit b627aee45f
48 changed files with 588 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eslint.config.mjs
View File

@@ -277,7 +277,7 @@ export default tseslint.config([
'import/no-unresolved': [
'error',
{
ignore: ['vite/modulepreload-polyfill'],
ignore: ['vite/modulepreload-polyfill', '^virtual:.+'],
},
],