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 a942ad3062 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.		6 years ago
..
core	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flavours	Merge pull request #794 from ThibG/glitch-soc/merge-upstream	6 years ago
fonts	…
images	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
packs	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago