Claire c79a03b319 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our README.		2022-03-15 20:45:27 +01:00
..
_attachment_list.html.haml
_detailed_status.html.haml	Fix “edited at” in public pages not being properly localized (#17806)	2022-03-15 19:07:25 +01:00
_og_description.html.haml
_og_image.html.haml	Change how changes to media attachments are stored for edits (#17696)	2022-03-09 09:06:17 +01:00
_poll.html.haml	Fix error when trying to render component for media without meta (#16112)	2021-05-05 21:16:55 +02:00
_simple_status.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-15 20:45:27 +01:00
_status.html.haml	Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)	2022-01-23 15:52:58 +01:00
embed.html.haml	Fix error when trying to render component for media without meta (#16112)	2021-05-05 21:16:55 +02:00
show.html.haml