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
..
montserrat.scss	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-02 09:49:38 +02:00
roboto-mono.scss	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-02 09:49:38 +02:00
roboto.scss	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-02 09:49:38 +02:00