Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring

2022-12-15 20:25:25 +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

…

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-12-15 20:25:25 +01:00

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

Add Southern Sami, and Lule Sami to language list under the ISO-639-3 standard (#21262)

2022-12-15 18:42:48 +01:00

mascot_helper.rb

…

routing_helper.rb

…

settings_helper.rb

…

statuses_helper.rb

Fix attachment rendering of edited posts in OpenGraph (#22270)

2022-12-15 17:41:20 +01:00

webfinger_helper.rb

…