Merge pull request #19706 from civicrm/5.35
authorEileen McNaughton <emcnaughton@wikimedia.org>
Tue, 2 Mar 2021 00:12:47 +0000 (13:12 +1300)
committerGitHub <noreply@github.com>
Tue, 2 Mar 2021 00:12:47 +0000 (13:12 +1300)
5.35

1  2 
CRM/Contact/Form/CustomData.php
CRM/Core/BAO/CustomField.php

Simple merge
Simple merge