Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml		2019-03-28 13:01:33 +01:00
..
core	Fix CW fold/unfold in remote interaction dialog	2019-02-17 15:40:49 +01:00
flavours	Revert "[Glitch] fix: update to emoji-mart 2.10.0"	2019-03-27 14:04:52 +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-03-28 13:01:33 +01:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-17 12:26:55 +01:00
skins
styles	Revert "fix: update to emoji-mart 2.10.0 (#10281)"	2019-03-27 14:04:58 +01:00