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.		2019-08-30 13:38:41 +02:00
..
applications
deletes
exports
featured_tags	Add explanation to featured hashtags page and profile (#11586)	2019-08-17 18:07:52 +02:00
flavours
identity_proofs	squashed identity proof updates (#10375)	2019-03-28 18:01:09 +01:00
imports
migrations	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
preferences	Add option to disable emoji replacements	2019-08-12 23:01:37 +02:00
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
shared
two_factor_authentication
two_factor_authentications	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00