Merge branch 'develop' into feature/CanonicalDetailPages
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:33:55 +0000 (15:33 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:33:55 +0000 (15:33 -0500)
commit97fae60163b70f28b9b2394600b969d41ffd42f3
tree7e61d82ee1cc0acfdd6af3837419074476f5a377
parent223771dd6bd03e1150a37ce2367c695eb0f63d27
parent2eb483c926d8d80601ab4eb244bfb810d947d62a
Merge branch 'develop' into feature/CanonicalDetailPages

Conflicts:
glm-member-db-packaging.php
views/front/packaging/list.html
classes/data/dataPackages.php
glm-member-db-packaging.php
models/admin/member/packaging.php
models/admin/members/packaging.php
models/front/packaging/detail.php
setup/databaseScripts/update_database_V1.1.0.php
setup/frontHooks.php
views/admin/member/packaging.html
views/admin/members/packaging.html
views/front/packaging/detail.html
views/front/packaging/list.html