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
..
_ip_block.html.haml	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	2023-06-02 19:58:18 +02:00
index.html.haml	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
new.html.haml	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00