Merge branch '5.31' into master
authorColeman Watts <coleman@civicrm.org>
Thu, 29 Oct 2020 21:19:51 +0000 (17:19 -0400)
committerColeman Watts <coleman@civicrm.org>
Thu, 29 Oct 2020 21:19:51 +0000 (17:19 -0400)
commit44111498547782278e1e50f0e3b4fd4051cc44f4
treeba205fd4f8a90b3ca6e71b1b45e972dbb971a958
parentd6789d2374e9c49ad74d5cca6cda45baf9530742
parentefefb1d7ba4492005241b18e61e5b7d55c610853
Merge branch '5.31' into master
ext/search/Civi/Search/Admin.php
ext/search/ang/searchActions/SaveSmartGroup.ctrl.js
ext/search/ang/searchActions/crmSearchActionUpdate.html
ext/search/ang/searchActions/crmSearchActions.component.js
ext/search/ang/searchAdmin/crmSearch.component.js
ext/search/ang/searchAdmin/crmSearch.html
tests/phpunit/api/v4/Entity/ConformanceTest.php