mirror of https://github.com/tootsuite/mastodon
3ab6a8b8be
Conflicts: spec/views/about/show.html.haml_spec.rb |
||
|---|---|---|
| .. | ||
| _contact.html.haml_spec.rb | ||
| show.html.haml_spec.rb | ||