mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 15:15:08 +01:00
c56a504d11
Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes. |
||
---|---|---|
.. | ||
_account.html.haml | ||
show.html.haml |