mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-19 00:21:40 +01:00
9044a2b051
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.