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 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.		5 years ago
..
applications	…
deletes	…
exports	Add CSV export for lists and domain blocks (#9677)	6 years ago
featured_tags	Add explanation to featured hashtags page and profile (#11586)	5 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	…
preferences	Add option to disable emoji replacements	5 years ago
profiles	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
shared	…
two_factor_authentication	…
two_factor_authentications	…