David Yip 54148b9a4a Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss		2018-01-02 00:11:41 -06:00
..
core	Moved flavour UI into own prefs tab	2017-12-10 20:32:27 -08:00
flavours	Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000)	2017-12-28 08:30:51 -06:00
fonts	Theme: Windows 95	2017-10-26 23:22:48 -07:00
images	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-02 00:11:41 -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-02 00:11:41 -06:00
packs	Skins support	2017-11-30 19:29:47 -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-02 00:11:41 -06:00