Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
2023-06-10 16:22:14 +02:00
..
2019-09-29 21:31:51 +02:00
2020-10-12 16:33:49 +02:00
2023-04-27 01:46:18 +02:00
2023-04-09 11:25:30 +02:00