David Yip f4b2478af1 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml		2018-01-28 22:45:17 -06:00
..
core	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
flavours	Remove some leftover code, I guess	2018-01-23 09:20:18 +01:00
fonts
images	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
locales
mastodon	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-28 22:45:17 -06:00
packs	Fix hide and show media button on admin page (#6347)	2018-01-24 13:29:46 +01:00
skins/vanilla/win95
styles	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-28 22:45:17 -06:00