Merge branch 'feature/FixAddPackageButton' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 27 Jan 2016 16:59:29 +0000 (11:59 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 27 Jan 2016 16:59:29 +0000 (11:59 -0500)
commit8fa0f4d65f67d1c707a9dc2a3a342f195c35ac0f
tree3ab668ac93d0dbe5266f0ae7dc89da8602af952d
parent121026287bf686a7a8a4e647629fd545dfb66c8a
parentb76d0148c32231113b68c1207adc825eb58a921a
Merge branch 'feature/FixAddPackageButton' into develop

Conflicts:
views/admin/members/packaging.html