Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/fonts/montserrat.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto-mono.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/models/account.rb`: Textual conflict only caused by glitch-soc using a different value for character limits in a nearby line. Applied upstream's changes. - `app/views/statuses/_simple_status.html.haml`: Attribute added to a tag modified by glitch-soc. Added upstream's attributes. - `yarn.lock`: Upstream added/updated dependencies close to glitch-soc-only ones. Updated/added upstream dependencies.		2022-06-02 09:49:38 +02:00
..
_attachment_list.html.haml
_detailed_status.html.haml	Add lang html attr to each posts (#18544)	2022-05-28 15:50:36 +02: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	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
_simple_status.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-02 09:49:38 +02: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