mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-15 15:44:56 +01:00
Code Issues Projects Releases Wiki Activity
c6df6686af
mastodon/app/views/settings/preferences/other
History
Claire 322e907e04 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.
2022-02-09 17:28:33 +01:00
..
show.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +01:00