David Yip 4cca1d1e7e Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb		2017-12-30 17:20:07 -06:00
..
core	Moved flavour UI into own prefs tab	2017-12-10 20:32:27 -08:00
flavours	Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch	2017-12-26 17:03:29 -05:00
fonts	Theme: Windows 95	2017-10-26 23:22:48 -07:00
images	Switch to tootsuite's elephant friend for the drawer	2017-12-30 17:17:37 -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	2017-12-30 17:20:07 -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	Use ~ notation in components for image references	2017-12-30 17:15:20 -06:00