Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.		2022-02-17 10:58:44 +01:00
..
_attachment_list.html.haml
_detailed_status.html.haml	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
_og_description.html.haml
_og_image.html.haml
_poll.html.haml
_simple_status.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-23 18:24:01 +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
show.html.haml