Thibaut Girka 356e9150df Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock		2019-06-19 18:36:16 +02:00
..
core	Include necessary JS in auth pages	2019-06-13 22:38:22 +02:00
flavours	Change preferences link in local settings modal from sliders to cog for consistency	2019-06-19 15:19:23 +02:00
fonts
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
locales
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-19 18:36:16 +02:00
packs	Put poll options behind content warnings (#10983)	2019-06-08 17:40:59 +02:00
skins
styles	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-13 22:23:20 +02:00