mirrors/glitch-social
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon synced 2024-03-09 07:35:42 +00:00
Code Releases Activity
glitch-social/app/views/settings/profiles
History
Claire 63acdebc5d Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because of a code style fix, while some changed lines are
  absent from glitch-soc.
  Ignored the deleted lines.
2024-01-11 13:17:13 +01:00
..
show.html.haml
Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream
2024-01-11 13:17:13 +01:00