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.		2019-04-04 14:53:52 +02:00
..
admin.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
common.js	Avoid loading rails-ujs twice on vanilla flavour	2018-07-16 16:42:52 +02:00
embed.js	…
mailer.js	…
public.js	Port a few public.js changes from upstream, move some code around	2019-01-10 18:45:17 +01:00
settings.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
theme.yml	Fix CW fold/unfold in remote interaction dialog	2019-02-17 15:40:49 +01:00