Jeremy Kescher 3d2fc73ecb Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/mastodon/initial_state.js		2022-11-02 21:12:42 +01:00
..
v1	Merge remote-tracking branch 'upstream/main' into develop	2022-11-02 21:12:42 +01:00
v2	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
web	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
base_controller.rb	Fix uncaught error when invalid date is supplied to API (#19480)	2022-10-27 14:30:52 +02:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00