Merge pull request #15056 from civicrm/5.17
authorEileen McNaughton <emcnaughton@wikimedia.org>
Sat, 17 Aug 2019 03:34:49 +0000 (15:34 +1200)
committerGitHub <noreply@github.com>
Sat, 17 Aug 2019 03:34:49 +0000 (15:34 +1200)
5.17

1  2 
sql/civicrm_generated.mysql

Simple merge