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	[Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile	2019-03-30 18:19:40 +01:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
packs	Hopefully fix input text selection quirks on iOS (#10463)	2019-04-03 17:54:54 +02:00
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-01 21:28:31 +02:00