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	…
flavours	Change preferences link in local settings modal from sliders to cog for consistency	2019-06-19 15:19:23 +02:00
fonts	…
images	…
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-19 18:36:16 +02:00
packs	…
skins	…
styles	…