mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
![]() Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json |
||
---|---|---|
.. | ||
_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 |