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.

Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn		6 years ago
..
core	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
flavours	Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu	6 years ago
fonts	Theme: Windows 95	6 years ago
images	Merge branch 'master' of https://github.com/tootsuite/mastodon	6 years ago
locales	Javascript intl8n flavour support	7 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
packs	Merge branch 'master' into glitch-soc/merge	6 years ago
skins	Port Sylvhem's mastodon-light to glitch flavour	6 years ago
styles	Merge branch 'master' into glitch-soc/merge	6 years ago