From: Chuck Scott <cscott@gaslightmedia.com>
Date: Wed, 27 Jan 2016 16:59:29 +0000 (-0500)
Subject: Merge branch 'feature/FixAddPackageButton' into develop
X-Git-Tag: v1.1.0^2~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8fa0f4d65f67d1c707a9dc2a3a342f195c35ac0f;p=WP-Plugins%2Fglm-member-db-packaging.git

Merge branch 'feature/FixAddPackageButton' into develop

Conflicts:
	views/admin/members/packaging.html
---

8fa0f4d65f67d1c707a9dc2a3a342f195c35ac0f