Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock		2019-06-03 14:54:30 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-22 20:40:04 +02:00
flavours	Fix expanding status from menu modal in glitch-soc	2019-06-02 14:11:32 +02:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-28 17:45:06 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	2019-06-03 14:54:30 +02:00
packs	Animate avatar GIFs on-hover on public profiles (#10549)	2019-04-21 04:47:39 +02:00
skins	Port Sylvhem's mastodon-light to glitch flavour	2018-05-07 17:00:02 +02:00
styles	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	2019-06-03 14:54:30 +02:00