mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-21 12:47:58 +00:00
1c9c0167b7
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
_follow_button.html.haml | ||
_follow_grid.html.haml | ||
_grid_card.html.haml | ||
_header.html.haml | ||
_moved_strip.html.haml | ||
_nothing_here.html.haml | ||
_og.html.haml | ||
show.html.haml |