You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 4cca1d1e7e Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb		7 years ago
..
core	Moved flavour UI into own prefs tab	7 years ago
flavours	Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch	7 years ago
fonts	Theme: Windows 95	7 years ago
images	Switch to tootsuite's elephant friend for the drawer	7 years ago
locales	Javascript intl8n flavour support	7 years ago
mastodon	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
packs	Skins support	7 years ago
skins/vanilla/win95	Ruby intl8n for themes	7 years ago
styles	Use ~ notation in components for image references	7 years ago