Merge branch 'feature/CanonicalDetailPages' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:55:36 +0000 (15:55 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:55:36 +0000 (15:55 -0500)
commitde4bd0d9b0387bfae25d4b17edb00944f49cc538
tree61e51357e996de40f9c94792614ac6abf22c7759
parent3d2cb6cc4dcecbe4d9b12dcb4fc1afe010377040
parent97fae60163b70f28b9b2394600b969d41ffd42f3
Merge branch 'feature/CanonicalDetailPages' into develop

Conflicts:
glm-member-db-packaging.php
views/front/packaging/detail.html
views/front/packaging/list.html
glm-member-db-packaging.php
views/front/packaging/list.html