Baptiste Lemoine b872c1c7c0 Merge branch 'master' of https://github.com/tootsuite/mastodon ... Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com> # Conflicts: # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js		2020-02-12 10:03:28 +01:00
..
base_controller.rb	Improve web api protect (#6343)	2018-04-17 15:23:46 +02:00
embeds_controller.rb	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
push_subscriptions_controller.rb	Add follow_request notification type (#12198)	2019-12-01 17:25:29 +01:00
settings_controller.rb	Improve web api protect (#6343)	2018-04-17 15:23:46 +02:00