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 bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.		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	…
mailer.js	Fixed improper mailer import	7 years ago
public.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings.js	Restore glitch-soc's 500 characters limit for bios (fixes #625)	6 years ago
theme.yml	Fix mailer to use webpack core	7 years ago