Jeremy Kescher 9fe04326ea Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # config/routes.rb # db/schema.rb # lib/mastodon/version.rb		2023-05-09 23:26:00 +02:00
..
components	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
containers	Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream (#2208)	2023-05-07 18:22:25 +02:00
index.jsx	Update emoji reaction patches	2023-05-07 22:01:04 +02:00