Jeremy Kescher 122870cb6b Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # config/initializers/rack_attack.rb # lib/mastodon/version.rb		2022-11-14 22:18:48 +01:00
..
glitch	Merge remote-tracking branch 'upstream/main' into develop	2022-11-14 22:18:48 +01:00
vanilla	Update Flavour 'ja' Translation (#1911)	2022-11-10 17:26:28 +01:00