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
..
admin_mailer.rb	Split AccountsHelper from StatusesHelper (#12078)	2019-10-24 22:50:09 +02:00
application_mailer.rb	Remove MailerHelper does nothing (#9604)	2018-12-22 02:35:55 +01:00
notification_mailer.rb	Split AccountsHelper from StatusesHelper (#12078)	2019-10-24 22:50:09 +02:00
user_mailer.rb	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00