Merge pull request #17431 from civicrm/5.26
authorEileen McNaughton <emcnaughton@wikimedia.org>
Sun, 31 May 2020 06:30:47 +0000 (18:30 +1200)
committerGitHub <noreply@github.com>
Sun, 31 May 2020 06:30:47 +0000 (18:30 +1200)
5.26 to masterr


Trivial merge