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 e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		6 years ago
..
core	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flavours	Fix mention links in detailed statuses not opening in the WebUI	6 years ago
fonts	…
images	…
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
packs	Escape HTML in profile name preview in profile settings (#9446)	6 years ago
skins	Port Sylvhem's mastodon-light to glitch flavour	7 years ago
styles	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago