David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		2018-05-18 08:47:10 -05:00
..
show.html.haml	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00