mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 23:54:52 +01:00
34b8346e7f
Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb |
||
---|---|---|
.. | ||
_account.html.haml | ||
index.html.haml |