David Yip 54148b9a4a Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss		2018-01-02 00:11:41 -06:00
..
_theme.html.haml	Various fixes	2017-12-04 21:58:10 -08:00
admin.html.haml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
application.html.haml	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-24 15:17:12 +00:00
auth.html.haml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
embedded.html.haml	Minor fixes	2017-11-21 18:17:38 -08:00
error.html.haml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
mailer.text.erb	Instance helper to replace site title helper (#2038)	2017-04-18 00:16:32 +02:00
modal.html.haml	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-02 00:11:41 -06:00
public.html.haml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00