Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire committed 2021-05-12 11:03:05 +02:00
commit dc58d02192
23 files changed
+135 -35

No files matched your search

@@ -177,7 +177,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
end
def href
explore_hashtag_url(object)
tag_url(object)
end
def name