mirror of https://github.com/tootsuite/mastodon
9adeaf2bfc
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system |
||
|---|---|---|
| .. | ||
| _bio.html.haml | ||
| _header.html.haml | ||
| _moved.html.haml | ||
| _og.html.haml | ||
| show.html.haml | ||