Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2022-11-06 09:50:41 +01:00
..
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
accounts_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
application_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
branding_helper.rb	Fix wrong aspect ratio of logo in icons (#18639)	2022-06-11 20:32:02 +02:00
context_helper.rb
domain_control_helper.rb
email_helper.rb
flashes_helper.rb
formatting_helper.rb
home_helper.rb	Fix wrong size of avatars in admin UI (#19457)	2022-10-25 21:43:33 +02:00
instance_helper.rb
jsonld_helper.rb
languages_helper.rb	fix name of Lao language (#19520)	2022-10-29 13:34:56 +02:00
mascot_helper.rb
routing_helper.rb	Fix CDN_HOST not affected on full_asset_url (#18662)	2022-06-23 23:09:32 +02:00
settings_helper.rb
statuses_helper.rb
webfinger_helper.rb