Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream
Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.
2024-04-06 21:01:40 +02:00
..
2017-11-24 02:05:53 +01:00
2023-04-09 11:25:30 +02:00
2020-06-02 19:24:53 +02:00
2024-03-11 08:57:07 +00:00