Thibaut Girka 8f720be9f3 Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream

2018-10-11 14:12:36 +02:00

..

_theme.html.haml

…

admin.html.haml

…

application.html.haml

Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream

2018-10-11 14:12:36 +02:00

auth.html.haml

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

embedded.html.haml

Fix locale packs loading in embed layout

2018-08-22 20:39:33 +02:00

error.html.haml

Hardcode default skin/theme in error layout (fixes #373)

2018-05-31 14:38:48 +02:00

mailer.html.haml

…

mailer.text.erb

…

modal.html.haml

Revert Font Awesome 5 upgrade (#8810)

2018-09-28 02:11:14 +02:00

plain_mailer.html.haml

…

public.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-07 19:47:56 +02:00