Claire 085a1197da Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' 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
..
_instance.html.haml	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	2023-06-02 19:58:18 +02:00
index.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
show.html.haml	Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream	2023-06-10 16:22:14 +02:00