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-08 18:40:08 +02:00
containers	Move flavours/glitch/util/initial_state to flavours/glitch/initial_state	2022-10-11 10:17:04 +02:00
util	[Glitch] Change all components to use the same error page in web UI	2023-04-16 18:20:51 +02:00
index.jsx	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00