mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-18 16:11:42 +01:00
1c9c0167b7
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml