Thibaut Girka 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's		2019-11-07 13:43:56 +01:00
..
core
flavours
fonts
images
locales
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-07 13:43:56 +01:00
packs
skins
styles	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-07 13:43:56 +01:00