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
..
assets	…
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
paperclip	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
templates	…
cli.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	6 years ago