David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00

..

applications

Remove empty strings (#5732)

2017-11-17 10:52:30 +09:00

deletes

…

exports

…

follower_domains

…

imports

…

keyword_mutes

Override Action View name inference in settings/keyword_mutes.

2017-10-24 18:40:28 -05:00

notifications

Add option to block direct messages from people you don't follow (#5669)

2017-11-14 21:12:57 +01:00

preferences

Add option to reduce motion (#5393)

2017-10-16 09:36:15 +02:00

profiles

Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream

2017-09-28 09:12:17 +02:00

shared

…

two_factor_authentication

…

two_factor_authentications

…