Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-28 22:56:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
2d09653d50b8733cf53a5f72dc9c63b3b42cdf6a
mastodon/app/views/settings/preferences
History
Claire 42a0898f16 Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because glitch-soc does not have a theme selector here.
2023-06-10 18:42:29 +02:00
..
appearance
Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream
2023-06-10 18:42:29 +02:00
notifications
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-31 21:30:27 +02:00
other
Fix default content type setting not applying (#2176)
2023-04-12 20:12:25 +02:00