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
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
flavours	…
fonts	…
images	…
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
packs	…
skins	…
styles	…