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
..
_bio.html.haml	Refactor account and status formatting (#17877)	2022-03-28 01:17:17 +02:00
_header.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
_moved.html.haml	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
_og.html.haml	Fix various issues around OpenGraph representation of media (#14133)	2020-06-25 01:33:01 +02:00
show.html.haml	Change number_to_human calls to always use 3-digits precision (#16469)	2021-07-07 21:13:08 +02:00
show.rss.ruby	Remove item titles from RSS feeds (#18640)	2022-06-12 02:48:03 +02:00