Claire d8b0a732aa Merge commit '1483a3ddfe' 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
..
show.html.haml	Merge commit '1483a3ddfe' into glitch-soc/merge-upstream	2023-06-10 16:22:14 +02:00