3 Commits

Author	SHA1	Message	Date
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
Jeong Arm	6a1f08d29a	Prevent archiving when user set "noindex" (#11421)	2019-07-28 13:46:04 +02:00
Eugen Rochko	b851456139	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00