Merge pull request #11031 from kcristiano/17633
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 2 Oct 2017 19:15:45 +0000 (08:15 +1300)
committerGitHub <noreply@github.com>
Mon, 2 Oct 2017 19:15:45 +0000 (08:15 +1300)
CRM-17633: Changes to support WP in it's own directory.


Trivial merge