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
..
fonts	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
images	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
mastodon	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
packs	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
styles	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00