Merge pull request #25951 from civicrm/5.60
authorEileen McNaughton <emcnaughton@wikimedia.org>
Wed, 29 Mar 2023 01:21:32 +0000 (14:21 +1300)
committerGitHub <noreply@github.com>
Wed, 29 Mar 2023 01:21:32 +0000 (14:21 +1300)
5.60 to master

1  2 
Civi/Api4/Service/Schema/SchemaMapBuilder.php
Civi/Api4/Service/Spec/SpecFormatter.php
ext/search_kit/Civi/Search/Admin.php

Simple merge