mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-05 13:04:59 +00:00
02062aab55
Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb |
||
---|---|---|
.. | ||
show.html.haml_spec.rb |