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 21394c5462 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml		7 years ago
..
core	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
flavours	Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui	7 years ago
fonts	Theme: Windows 95	7 years ago
images	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
locales	Javascript intl8n flavour support	7 years ago
mastodon	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
packs	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
skins/vanilla/win95	Ruby intl8n for themes	7 years ago
styles	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago