Claire 040b7d37a4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict due to glitch-soc having extra code for a proper direct visibility timeline, in a part of the code upstream refactored. Restored glitch-soc's extra code in the refactored bit.		2022-05-16 09:42:32 +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	Fix rss view on hashtag (#18406)	2022-05-12 22:40:54 +02:00