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
..
_account.html.haml	Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master	2020-07-17 20:49:44 +02:00
index.html.haml	Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master	2020-07-17 20:49:44 +02:00
show.html.haml	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00