projects
/
WP-Plugins
/
glm-member-db.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fbac39e
e8c51de
)
Merge branch 'develop' into release/1.0.55
author
Chuck Scott
<cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:25:07 +0000
(15:25 -0500)
committer
Chuck 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
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
glm-member-db.php
index
dc20b21
,
26604fb
..
41d7649
---
1
/
glm-member-db.php
---
2
/
glm-member-db.php
+++ b/
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');
/*