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 a02244f17c Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js		6 years ago
..
admin.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
common.js	Avoid loading rails-ujs twice on vanilla flavour	6 years ago
embed.js	Finalized theme loading and stuff	7 years ago
mailer.js	Fixed improper mailer import	6 years ago
public.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
theme.yml	Fix mailer to use webpack core	6 years ago