Claire 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream README has been changed, but we have a completely different one. Kept our `README.md`. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Change the code style to match upstream's but otherwise do not change our code. - `spec/lib/sanitize_config_spec.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Kept our version, since the tests are mostly glitch-soc's, except for cases which are purposefuly different.		2023-03-05 20:46:56 +01:00
..
index.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-22 17:00:38 +01:00
show.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-05 20:46:56 +01:00