Merge pull request #6989 from nupplaphil/task/basePath_baseUrl_fix

author Hypolite Petovan <hypolite@mrpetovan.com>

Thu, 11 Apr 2019 08:07:20 +0000 (04:07 -0400)

committer GitHub <noreply@github.com>

Thu, 11 Apr 2019 08:07:20 +0000 (04:07 -0400)
author Hypolite Petovan <hypolite@mrpetovan.com>
Thu, 11 Apr 2019 08:07:20 +0000 (04:07 -0400)
committer GitHub <noreply@github.com>
Thu, 11 Apr 2019 08:07:20 +0000 (04:07 -0400)
diff --cc config/defaults.config.php
Simple merge
diff --cc src/Model/Contact.php
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Thu, 11 Apr 2019 08:07:20 +0000 (04:07 -0400)
committer	GitHub <noreply@github.com>
	Thu, 11 Apr 2019 08:07:20 +0000 (04:07 -0400)
		1	2
config/defaults.config.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Model/Contact.php	patch \|	diff1 \|	diff2 \|	blob \| history