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		7 years ago
..
core	…
flavours	Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu	7 years ago
fonts	…
images	…
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
packs	Merge branch 'master' into glitch-soc/merge	7 years ago
skins	Port Sylvhem's mastodon-light to glitch flavour	7 years ago
styles	Merge branch 'master' into glitch-soc/merge	7 years ago