You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/javascript/core
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.
7 years ago
..
admin.js Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
common.js Avoid loading rails-ujs twice on vanilla flavour 7 years ago
embed.js Finalized theme loading and stuff 7 years ago
mailer.js Fixed improper mailer import 7 years ago
public.js Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
settings.js Restore glitch-soc's 500 characters limit for bios (fixes #625) 7 years ago
theme.yml Fix mailer to use webpack core 7 years ago