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)
commit40b45f293b69810016f751b2f82ea66318629ebf
tree452ea42ca98574990ad8f370e338c0eef150a102
parent96363805cd88ca6717a830aeb70f069ff0a25a80
parentb181a3da708a6ad086a8403bd99069031793852c
Merge pull request #13032 from civicrm/5.7

5.7 to master
sql/civicrm_generated.mysql