From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 29 Jan 2020 00:42:11 +0000 (+1300)
Subject: Merge pull request #16410 from civicrm/5.22
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=20b47253347998c55797faa6b08c6131c22115ed;p=civicrm-core.git

Merge pull request #16410 from civicrm/5.22

5.22 to master
---

20b47253347998c55797faa6b08c6131c22115ed