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 020b40efdb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml		7 years ago
..
applications	Remove empty strings (#5732)	7 years ago
deletes	Fix autocomplete option in haml files (#4438)	7 years ago
exports	Scrollable tables in settings pages (#4857)	7 years ago
flavours	Don't show skins selector when there's only one (#256)	7 years ago
follower_domains	Scrollable tables in settings pages (#4857)	7 years ago
imports	…
keyword_mutes	Override Action View name inference in settings/keyword_mutes.	7 years ago
migrations	Add UI for setting up account migration (#5832)	7 years ago
notifications	Add option to block direct messages from people you don't follow (#5669)	7 years ago
preferences	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
profiles	Merge remote-tracking branch 'tootsuite/master'	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