Jeremy Kescher 0d829dadea Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/features/ui/index.js # app/javascript/mastodon/features/ui/index.js		2023-01-18 22:29:27 +01:00
..
glitch	Merge remote-tracking branch 'upstream/main' into develop	2023-01-18 22:29:27 +01:00
vanilla	Fix prettifier/lint issues (#2066)	2023-01-04 18:38:45 +01:00