CONFLICT (content): Merge conflict in spec/presenters/instance_presenter_spec.rb
おう
Mastodon is the best way to keep up with what's happening.
Follow anyone across the fediverse and see it all in chronological order. No algorithms, ads, or clickbait in sight.