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 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		6 years ago
..
core	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
flavours	Merge pull request #468 from ThibG/glitch-soc/features/reports-improvements	6 years ago
fonts	Theme: Windows 95	7 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/master	6 years ago
packs	Merge branch 'master' into glitch-soc/master	6 years ago
skins	Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables	6 years ago
styles	Merge branch 'master' into glitch-soc/master	6 years ago