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
..
2017-11-24 02:05:53 +01:00
2023-04-30 14:06:53 +02:00
2023-04-09 11:25:30 +02:00
2023-05-02 12:08:48 +02:00
2023-06-05 09:37:02 +02:00
2020-06-02 19:24:53 +02:00
2023-04-30 14:07:21 +02:00
2023-04-12 10:06:57 +02:00