mastodon/app/views/layouts
Thibaut Girka ae4240d236 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/views/layouts/application.html.haml

Edited:
        app/helpers/application_helper.rb
        app/views/admin/domain_blocks/new.html.haml

Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.

Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
2018-08-26 14:23:24 +02: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 branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +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 Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-28 22:45:17 -06:00
mailer.text.erb Replace tutorial modal with welcome e-mail (#6273) 2018-01-18 19:17:25 +01:00
modal.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
plain_mailer.html.haml HTML e-mails for UserMailer (#6256) 2018-01-16 03:29:11 +01:00
public.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00