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
..
glitch	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
vanilla	Fix building vanilla flavor after JSX change	2023-02-25 14:28:59 +01:00