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 11cc2e099a Merge branch 'master' into glitch-soc/merge-master ... Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scss		7 years ago
..
core	…
flavours	…
fonts	…
images	…
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-master	7 years ago
packs	…
skins	…
styles	Merge branch 'master' into glitch-soc/merge-master	7 years ago