Merge pull request #12677 from civicrm/5.5
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 16 Aug 2018 08:44:55 +0000 (20:44 +1200)
committerGitHub <noreply@github.com>
Thu, 16 Aug 2018 08:44:55 +0000 (20:44 +1200)
commit6f4f6c85986d22d55ccc2de1693490a432c098ac
tree48e59af065fb0cb702ba89b10f7ea6c846fd209a
parentb47f9d98b3da2193f384d68769594079e9d195d0
parent5cf139861af1ef15cc523aa147dc85cf34137177
Merge pull request #12677 from civicrm/5.5

5.5 to master
CRM/Upgrade/Incremental/General.php