You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 36393e1d2b 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.		6 years ago
..
_theme.html.haml	…
admin.html.haml	…
application.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
auth.html.haml	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
embedded.html.haml	Fix locale packs loading in embed layout	6 years ago
error.html.haml	Hardcode default skin/theme in error layout (fixes #373)	7 years ago
mailer.html.haml	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
mailer.text.erb	Replace tutorial modal with welcome e-mail (#6273)	7 years ago
modal.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
plain_mailer.html.haml	…
public.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago