David Yip 2ca965c704 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss		2018-01-19 15:22:10 -06:00
..
core	Fixed improper mailer import	2018-01-15 21:23:26 -08:00
flavours	Port 7badad7797 to glitch frontend	2018-01-18 10:25:37 -06:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
images	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-19 15:22:10 -06: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-01-19 15:22:10 -06:00
packs	Fix mailer to use webpack core	2018-01-15 21:17:03 -08: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-01-19 15:22:10 -06:00