mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-17 07:32:09 +00:00
eb39db7f93
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json 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 |