Claire 0e74d4da59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.		2022-06-21 08:28:59 +02:00
..
_og.html.haml	Strip tags from og:description on public tag page (#7437)	2018-05-10 14:38:40 +02:00
show.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +01:00
show.rss.ruby	Remove item titles from RSS feeds (#18640)	2022-06-12 02:48:03 +02:00