mirror of https://github.com/tootsuite/mastodon
34b8346e7f
Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb |
||
|---|---|---|
| .. | ||
| _account.html.haml | ||
| index.html.haml | ||