Merge pull request #11635 from civicrm/4.7.30-rc
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 6 Feb 2018 04:38:27 +0000 (17:38 +1300)
committerGitHub <noreply@github.com>
Tue, 6 Feb 2018 04:38:27 +0000 (17:38 +1300)
4.7.30 rc merge to master

1  2 
CRM/Core/BAO/Website.php

Simple merge