mirror of https://framagit.org/tykayn/mastodon.git
![]() Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
index.html.haml |
![]() Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
index.html.haml |