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
..
_attachment_list.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
_detailed_status.html.haml	Change reported media attachments to always be hidden in admin UI (#12879)	2020-01-18 19:50:43 +01:00
_og_description.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
_og_image.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
_poll.html.haml	Add voters count support (#11917)	2019-09-29 22:58:01 +02:00
_simple_status.html.haml	Add "Show thread" button to public profiles (#13000)	2020-01-29 17:35:54 +01:00
_status.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
embed.html.haml	Fix cache digesting log noise on status embeds (#12750)	2020-01-03 05:00:17 +01:00
show.html.haml	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00