David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		2018-02-04 16:36:19 -06:00
..
core	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
flavours	Fix detailed-status	2018-02-04 10:35:09 +09:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
images	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
locales	Javascript intl8n flavour support	2017-12-10 11:08:04 -08:00
mastodon	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-04 16:36:19 -06:00
packs	Fix hide and show media button on admin page (#6347)	2018-01-24 13:29:46 +01:00
skins/vanilla/win95	Ruby intl8n for themes	2017-12-10 11:08:04 -08:00
styles	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-04 16:36:19 -06:00