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 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		6 years ago
..
applications	…
deletes	…
exports	…
featured_tags	Add featured hashtags to profiles (#9755)	6 years ago
flavours	Fix settings/flavours	6 years ago
identity_proofs	squashed identity proof updates (#10375)	6 years ago
imports	Add option to overwrite imported data (#9962)	6 years ago
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	…
shared	…
two_factor_authentication	…
two_factor_authentications	…