Merge pull request #13032 from civicrm/5.7
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 29 Oct 2018 22:28:14 +0000 (11:28 +1300)
committerGitHub <noreply@github.com>
Mon, 29 Oct 2018 22:28:14 +0000 (11:28 +1300)
5.7 to master

1  2 
sql/civicrm_generated.mysql

Simple merge