Merge pull request #15249 from civicrm/5.18
authorEileen McNaughton <emcnaughton@wikimedia.org>
Sun, 8 Sep 2019 20:48:21 +0000 (08:48 +1200)
committerGitHub <noreply@github.com>
Sun, 8 Sep 2019 20:48:21 +0000 (08:48 +1200)
5.18 to master

1  2 
sql/civicrm_generated.mysql

Simple merge