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
..
about.js	Upgrade webpack to version v4.x (#6655)	2018-07-14 03:56:41 +02:00
admin.js	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
application.js	Upgrade webpack to version v4.x (#6655)	2018-07-14 03:56:41 +02:00
error.js	Change error graphic to hover-to-play (#10055)	2019-02-15 23:33:25 +01:00
mailer.js	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
public.js	Add client-side validation in password change forms (#14564)	2020-08-12 12:11:15 +02:00
share.js	Upgrade webpack to version v4.x (#6655)	2018-07-14 03:56:41 +02:00
two_factor_authentication.js	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00