tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
2ba4773ebe6d7c10d420b31adfadf7d2348261d3
Mastodon/app/models/user.rb
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

15 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink