Baptiste Lemoine aff743695a Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/account/components/header.js # config/webpack/production.js # db/schema.rb # yarn.lock		2020-09-21 14:36:15 +02:00
..
fonts	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
images	Fix keybase config serializer (#13742)	2020-05-12 15:28:29 +02:00
mastodon	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
packs	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
styles	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00