tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.
This commit is contained in:
Claire committed 2026-04-25 09:20:39 +02:00
2 parents 7631c4ace3 3473b8a652
commit b3bae7e78f
104 files changed
+1213 -186
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/javascript/images/anniversary.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 1440 1245"><path fill="#ffb900" d="M438.957 163.115c25.062 5.75 49.562 1.125 66.312-10.687-9.813-17.875-29.688-32.563-55.063-38.312-19.875-4.625-39.5-2.625-55.063 4.312 1.75-1.125 3.438-2.312 5.188-3.75 18.437-11.812 37.5-23.062 57.375-32.874-17.875 8.625-35.438 18.437-52.438 28.812 11.5-10.688 20.75-25.938 25.063-44.126 6.062-25.062 1.75-49.562-9.813-66.312-17.874 9.5-33.125 29.375-39.188 54.5-6.062 24.5-2 48.75 9.25 65.438-25.937 17-50.749 35.749-74.062 56.188 11.25-13.812 18.749-32.875 19.625-54.5.875-26.5-8.625-50.438-23.937-65.126-16.126 13.563-27.375 36.626-28.251 63.126-.875 26.25 8.375 49.874 23.063 64.312-23.626 21.625-45.812 45-66 69.749 7.5-14.437 11.25-32.875 9.25-52.188-2.625-26.812-15.251-49.563-32.563-62.251-14.437 15.563-22.5 40.375-19.875 67.438 2.625 26.5 15 48.749 31.688 61.374a726 726 0 0 0-34.312 49c-6.312 10.063-12.125 20.188-17.874 30.563 4.875-15.875 5.187-34.563-.313-53.625-7.5-26.5-24.5-47.251-44.125-56.812-11.813 18.437-15.251 44.688-7.813 71.5 7.5 25.937 23.626 46.437 42.938 56.188-12.688 24.812-23.938 50.437-33.438 76.688-.562-14.126-4.312-29.126-11.5-43.251-13.25-25.375-34.562-42.688-56.5-48.125-8.062 21.062-6.312 48.437 6.938 73.812 12.125 23.374 31.437 40.062 51.625 46.688-.875 3.187-2 6.312-2.875 9.5-7.187 24.5-12.687 49.312-17 74.374-2.875-14.437-9.5-29.125-19.625-42.688-17.875-23.062-42.375-36.625-65.125-38.312-4.313 22.5 2.312 49.875 20.188 72.938 16.437 21.625 38.937 34.562 60.562 37.749-2.875 24.188-4.625 48.437-4.625 72.625v7.813c-5.5-12.375-13.812-24.188-24.812-34.563-21.625-20.188-48.437-30-71.812-27.688-.562 23.375 10.688 49.563 32.312 70.063 19.625 18.437 43.812 27.937 65.75 27.937a582 582 0 0 0 9.499 77c-7.5-10.375-17.312-19.875-29.374-27.937-25.063-16.438-53.938-21.063-76.688-14.688 3.75 23.375 19.625 47.563 44.688 64 22.5 14.688 47.874 19.875 69.188 16.437 1.75 6.625 3.187 13.25 5.187 19.875 4.625 16.437 9.813 32.874 15.875 49-8.938-8.063-19.312-15-31.437-20.438-28.563-12.374-58.5-12.374-81-2.312 7.5 23.375 27.937 45.563 56.5 57.937 25.062 10.938 51.312 12.375 72.374 5.5 8.938 20.188 19 40.063 30.251 59.375-10.063-6.313-21.937-11.5-34.563-14.437-30.25-7.188-59.937-1.75-80.125 12.125 11.812 21.621 35.749 39.811 66 47.001 26.5 6.31 52.437 2.87 71.812-7.19 12.375 18.75 25.937 36.88 40.375 54.19-9.813-3.44-20.75-5.75-32.312-6.63-31.688-2-60.563 8.63-78.126 26.25 15.563 19.63 42.688 33.75 74.375 35.75 26.812 1.75 51.312-5.75 69.188-18.43 14.688 15.25 30 29.68 46.125 43.25-10.937-1.44-22.5-1.75-34.312 0-33.749 4.31-61.688 21.31-76.688 43.5 20.438 17.56 51.875 26.5 85.626 22.19 27.937-3.75 51.874-15.88 67.749-32.57 27.375 19.88 56.5 37.5 86.749 52.75 5.5 2.63 11.813.31 14.438-4.87 2.625-5.5.312-11.82-4.875-14.44-23.938-11.5-47-24.81-69.188-39.5 14.688-20.19 21.937-49 17.874-79.87-4.312-33.75-21.312-61.69-43.5-76.69-17.562 20.43-26.5 51.87-22.188 85.62 2.625 19 8.938 36.31 18.188 50.19-21.312-15.87-41.812-32.87-61.125-51.31 17-16.13 28.563-41.25 30.251-70.06 1.75-31.69-8.938-60.255-26.5-78.129-19.626 15.562-33.438 42.939-35.188 74.689-1.125 18.19 2 35.19 8.062 49.87-18.188-19.31-35.437-39.81-51-61.37 18.75-12.69 34.312-34.564 40.626-62.001 7.187-30.251 2-59.938-12.126-80.126-21.625 11.5-39.812 35.438-47 65.75-4.062 16.437-4.062 32.874-1.125 47.562-1.125-2-2.625-3.75-3.75-5.75-12.125-19-23.062-38.625-32.874-58.812 20.749-9.25 40.062-28.25 51-54.5 12.375-28.562 12.125-58.5 1.75-81-23.375 7.813-45.251 28.251-57.626 56.812-6.937 15.875-9.812 32.312-9.25 47.563-9.812-23.063-18.437-46.437-25.374-70.312-.313-.563-.313-1.125-.313-1.438 21.312-5.5 42.375-21.062 57.063-44.125 16.125-25.375 20.188-54.188 13.563-77-23.375 4.063-47.251 20.188-63.438 45.563-8.625 13.812-13.812 28.812-15.874 42.937-6.313-26.812-10.938-53.937-13.563-81.312 21.937-1.125 45.812-12.125 64.563-32.312 20.188-21.625 30-48.437 27.688-71.812-23.375-.562-49.563 10.688-70.063 32.312-12.125 13-20.437 27.937-24.812 42.688-.563-9.812-.875-19.625-1.125-29.688-.313-19.312.562-38.625 2.312-57.937 21.312 2.875 46.438-3.75 68.063-19.875 23.375-17.312 37.188-41.812 39.188-64.563-22.5-4.625-49.875 1.75-73.251 19-14.125 10.375-24.5 23.375-31.125 36.875 3.438-27.688 8.938-55.375 16.125-82.437 20.438 6.625 46.438 4.312 70.312-8.063 25.375-13.25 42.688-34.562 48.126-56.5-21.063-8.062-48.438-6.312-73.812 6.938-16.438 8.625-29.375 20.437-38.063 33.749 9.25-29.688 20.437-58.812 33.749-86.749 18.438 10.062 43.5 12.687 68.626 5.187 26.5-7.812 46.688-25.062 55.937-45-18.437-11.5-45-14.688-71.5-6.937-17.312 5.187-32 14.437-42.688 25.688 6.625-12.375 13.563-24.812 20.749-36.875 7.813-12.687 15.875-25.063 24.5-37.188 16.126 12.375 40.063 18.749 65.75 15.251 26.812-3.75 49-17.312 60.812-35.188-16.126-13.812-41.251-21.063-68.063-17.312-17.312 2.312-32.312 8.937-44.375 17.874 17.875-23.374 37.5-45.812 58.5-66.562 13.563 15.562 36.312 25.937 62.251 26.812 26.5.875 50.437-8.938 64.875-24.188-13.563-16.126-36.626-27.126-63.438-27.938-19.625-.562-37.5 4.625-51.625 13.25 23.375Line truncated
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB