David Yip 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		2018-03-02 21:46:44 -06:00
..
applications	Remove empty strings (#5732)	2017-11-17 10:52:30 +09:00
deletes
exports	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
flavours	Don't show skins selector when there's only one (#256)	2018-01-08 16:45:32 -08:00
follower_domains
imports
keyword_mutes	Override Action View name inference in settings/keyword_mutes.	2017-10-24 18:40:28 -05:00
migrations	Add UI for setting up account migration (#5832)	2017-11-27 22:47:06 +01:00
notifications	Add option to block direct messages from people you don't follow (#5669)	2017-11-14 21:12:57 +01:00
preferences	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
profiles	Merge remote-tracking branch 'tootsuite/master'	2017-11-27 22:33:26 -06:00
shared
two_factor_authentication
two_factor_authentications