David Yip 813da6788e Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	db/schema.rb

2018-04-14 09:12:50 -05: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

Scrollable tables in settings pages (#4857)

2017-09-09 02:26:58 +02:00

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 'origin/master' into gs-master

2018-04-14 09:12:50 -05:00

shared

…

two_factor_authentication

…

two_factor_authentications

…