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
..
applications	…
deletes	…
exports	…
featured_tags	…
flavours	Fix settings/flavours	6 years ago
identity_proofs	squashed identity proof updates (#10375)	6 years ago
imports	…
migrations	…
notifications	Add preference to disable e-mails about new pending accounts (#10529)	6 years ago
preferences	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
profiles	Change bio limit from 160 to 500 (#10790)	6 years ago
shared	…
two_factor_authentication	…
two_factor_authentications	…