me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/views/settings/preferences
History
Claire 0845bee8d6 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