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
..
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-26 19:18:55 +01:00
accounts_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-26 19:18:55 +01:00
application_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-02 09:49:38 +02:00
context_helper.rb
domain_control_helper.rb
email_helper.rb
flashes_helper.rb
formatting_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-26 23:30:10 +02:00
home_helper.rb
instance_helper.rb
jsonld_helper.rb	Fix not updating a status when newer version is fetched manually (#17745)	2022-03-12 09:11:36 +01:00
languages_helper.rb	Fix errors when rendering RSS feeds (#18531)	2022-05-26 23:02:42 +02:00
mascot_helper.rb
routing_helper.rb	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
settings_helper.rb
statuses_helper.rb	Replace leftover envelope icons with at icons (#18305)	2022-05-06 00:41:56 +02:00
webfinger_helper.rb