Merge pull request #13363 from civicrm/5.9
authorSeamus Lee <seamuslee001@gmail.com>
Fri, 28 Dec 2018 08:51:37 +0000 (19:51 +1100)
committerGitHub <noreply@github.com>
Fri, 28 Dec 2018 08:51:37 +0000 (19:51 +1100)
5.9

1  2 
settings/Core.setting.php

Simple merge