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 1682ac5717 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there.		6 years ago
..
admin.js	…
common.js	…
embed.js	…
mailer.js	…
public.js	…
settings.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
theme.yml	…