You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 ... Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss		7 years ago
..
applications	Scrollable tables in settings pages (#4857)	7 years ago
deletes	Fix autocomplete option in haml files (#4438)	7 years ago
exports	Scrollable tables in settings pages (#4857)	7 years ago
follower_domains	Scrollable tables in settings pages (#4857)	7 years ago
imports	…
preferences	Fix language filter codes (#4841)	7 years ago
profiles	Merge that good fresh upstream shit	7 years ago
shared	2FA controller cleanup (#2296)	8 years ago
two_factor_authentication	Fix autocomplete option in haml files (#4438)	7 years ago
two_factor_authentications	Fix autocomplete option in haml files (#4438)	7 years ago