luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-02 11:33:36 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/settings/preferences
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
..
appearance Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +01:00
notifications Add submit button to the top of preferences pages (#13068) 2020-03-08 16:04:03 +01:00
other Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +01:00