Merge conflict got into last hotfix in frontHooks.php. Fixed
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 11 Aug 2016 16:00:07 +0000 (12:00 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 11 Aug 2016 16:00:07 +0000 (12:00 -0400)
commitb289f65363bff4c2ae9aa6ca3e3fd0d5d55498c4
tree93e0bf2f00daf6272952adbb72c72092e5194037
parentc69a580c65df6fc2d2306e5a200ae5ffb13e011f
Merge conflict got into last hotfix in frontHooks.php. Fixed
index.php
setup/frontHooks.php