Mastodon

Files

David Yip 071c2c9c85 Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts:
	app/javascript/styles/mastodon/components.scss

2018-01-20 10:45:43 -06:00

_theme.html.haml

Various fixes

2017-12-04 21:58:10 -08:00

admin.html.haml

2017-11-20 22:13:37 -08:00

application.html.haml

2018-01-03 04:17:11 +00:00

auth.html.haml

2017-11-20 22:13:37 -08:00

embedded.html.haml

Minor fixes

2017-11-21 18:17:38 -08:00

error.html.haml

2017-11-20 22:13:37 -08:00

mailer.html.haml

2018-01-20 10:45:43 -06:00

mailer.text.erb

2018-01-18 19:17:25 +01:00

modal.html.haml

2018-01-02 00:11:41 -06:00

plain_mailer.html.haml

2018-01-16 03:29:11 +01:00

public.html.haml

2017-11-20 22:13:37 -08:00