Jeremy Kescher 855b0d4dbb Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # lib/mastodon/version.rb		2023-01-26 17:27:01 +01:00
..
aliases	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
applications	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
deletes	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
exports	Fix reference to non-existing translation in the exports page. (#15894)	2021-03-15 02:17:29 +01:00
featured_tags	Fix styling of featured tags in light theme (#23252)	2023-01-25 16:28:29 +01:00
flavours	Fix settings/flavours	2019-03-16 16:21:20 +01:00
imports	Add option to overwrite imported data (#9962)	2019-02-03 03:59:51 +01:00
login_activities	Add full user agent in tooltips for login activities (#16428)	2021-06-23 16:42:23 +02:00
migration/redirects	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
migrations	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
preferences	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00
profiles	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
shared	2FA controller cleanup (#2296)	2017-04-22 04:23:17 +02:00
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
two_factor_authentication_methods	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00