Thibaut Girka a835ea0e8f 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.		2019-04-04 14:53:52 +02:00
..
admin.js
common.js
embed.js
mailer.js	Fixed improper mailer import	2018-01-15 21:23:26 -08:00
public.js	Port a few public.js changes from upstream, move some code around	2019-01-10 18:45:17 +01:00
settings.js
theme.yml