Thibaut Girka b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.		2020-07-22 13:38:17 +02:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-22 13:38:17 +02:00
v2	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
web	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
base_controller.rb	Fix functional user requirements in whitelist mode (#14093)	2020-06-19 19:18:47 +02:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00
proofs_controller.rb	Fix proofs API being inaccessible in secure mode (#12495)	2019-11-28 04:07:49 +01:00