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 6dd676e006 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: config/locales/pl.yml The conflict in config/locales/pl.yml concerns the themes key, which is not used in glitchsoc. Resolution: remove the themes key-related changes, i.e. accept-ours.		6 years ago
..
core	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
flavours	Fix width only being set for standalone media	6 years ago
fonts	…
images	Merge branch 'master' of https://github.com/tootsuite/mastodon	6 years ago
locales	…
mastodon	Merge remote-tracking branch 'origin/master' into 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-upstream	6 years ago