Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json |
||
|---|---|---|
| .. | ||
| _account_details.html.haml | ||
| _report.html.haml | ||
| index.html.haml | ||
| show.html.haml | ||