Merge branch 'develop' into release/1.0.55
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:25:07 +0000 (15:25 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:25:07 +0000 (15:25 -0500)
Conflicts:
glm-member-db.php

1  2 
glm-member-db.php

@@@ -36,7 -36,7 +36,7 @@@
   *  the current version.
   */
  
- define('GLM_MEMBERS_PLUGIN_VERSION', '1.0.55');
 -define('GLM_MEMBERS_PLUGIN_VERSION', '1.0.53');
++define('GLM_MEMBERS_PLUGIN_VERSION', '1.0.56');
  define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.0.43');
  
  /*