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
..
_theme.html.haml
admin.html.haml
application.html.haml
auth.html.haml
embedded.html.haml
error.html.haml
mailer.html.haml
mailer.text.erb
modal.html.haml
plain_mailer.html.haml
public.html.haml