Merge tag 'v1.0.1' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 30 Nov 2015 21:30:36 +0000 (16:30 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 30 Nov 2015 21:30:36 +0000 (16:30 -0500)
commit50cec48f266eeffb54d7ff30d4663698ebc9b044
tree22a58473e2d2271e260caf21e8ecfdafbbfc3108
parentf05f2779ab01d548b36a71247bd10ed6f4d8cebf
parent92b4247a8a125ef1d5781ecb8b7c205bc13a95eb
Merge tag 'v1.0.1' into develop

First Version

Conflicts:
glm-member-db-contacts.php
glm-member-db-contacts.php