David Yip e0eebba461 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

1.7 KiB

Raw Blame History

View Raw