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

2017-11-28 11:45:13 -06:00

..

exports

…

two_factor_authentication

…

applications_controller.rb

…

deletes_controller.rb

…

exports_controller.rb

…

follower_domains_controller.rb

…

imports_controller.rb

…

keyword_mutes_controller.rb

Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.

2017-10-24 18:56:57 -05:00

migrations_controller.rb

Fix account migration feature (#5837)

2017-11-28 14:31:23 +01:00

notifications_controller.rb

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

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

preferences_controller.rb

Add option to reduce motion (#5393)

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

profiles_controller.rb

…

sessions_controller.rb

…

two_factor_authentications_controller.rb

…