Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		2020-08-30 16:13:08 +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
exports	Use different strings on exports page (#12569)	2019-12-19 12:47:55 +01:00
featured_tags
flavours
identity_proofs	Add ability to remove identity proofs from account (#13682)	2020-05-10 11:21:10 +02:00
imports
migration/redirects
migrations
preferences	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-03 21:23:49 +02:00
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-03 21:23:49 +02:00
shared
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