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
..
aliases	Fix account aliases page (#13452)	2020-04-13 06:41:43 +02:00
applications	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
deletes	Fix 2FA challenge and password challenge for non-database users (#11831)	2019-09-15 21:08:39 +02:00
exports	Use different strings on exports page (#12569)	2019-12-19 12:47:55 +01:00
featured_tags	Changed tag most_used to recently_used (#14760)	2020-09-07 17:47:41 +02:00
identity_proofs	Add ability to remove identity proofs from account (#13682)	2020-05-10 11:21:10 +02:00
imports	Add option to overwrite imported data (#9962)	2019-02-03 03:59:51 +01:00
migration/redirects	Add (back) option to set redirect notice on account without moving followers (#11994)	2019-09-29 05:03:19 +02:00
migrations	Add (back) option to set redirect notice on account without moving followers (#11994)	2019-09-29 05:03:19 +02:00
preferences	Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master	2020-07-17 20:49:44 +02:00
profiles	Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master	2020-07-17 20:49:44 +02:00
shared	2FA controller cleanup (#2296)	2017-04-22 04:23:17 +02:00
two_factor_authentication	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
two_factor_authentication_methods	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00