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