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 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		6 years ago
..
core	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flavours	[Glitch] Fix composer route opening when not needed	6 years ago
fonts	Theme: Windows 95	7 years ago
images	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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	Animate avatar GIFs on-hover on public profiles (#10549)	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