Merge branch 'develop' into feature/NewSettings
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Oct 2015 11:31:51 +0000 (07:31 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Oct 2015 11:31:51 +0000 (07:31 -0400)
commit338b451c51766635a8460539c0c1afcdd51684ae
treef2dc43cda32249042d6826e0c88d08fcc7ed7718
parent31c81fa628339299b39e23d36c6a5e3ff1724f40
parentb35673f9fc743a8f83c048ed33c2a7000ee9cbd6
Merge branch 'develop' into feature/NewSettings

Conflicts:
glm-member-db.php
glm-member-db.php
lib/GlmDataAbstract/DataAbstract.php