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
..
_bio.html.haml	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
_header.html.haml	Animate avatar GIFs on-hover on public profiles (#10549)	2019-04-21 04:47:39 +02:00
_moved.html.haml	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
_og.html.haml	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
show.html.haml	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00