Merge pull request #12725 from civicrm/5.5
authorSeamus Lee <seamuslee001@gmail.com>
Fri, 24 Aug 2018 20:42:13 +0000 (06:42 +1000)
committerGitHub <noreply@github.com>
Fri, 24 Aug 2018 20:42:13 +0000 (06:42 +1000)
5.5

1  2 
sql/civicrm_generated.mysql

Simple merge