projects
/
WP-Plugins
/
glm-member-db-events.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
257861f
ccf3384
)
Merge branch 'release/1.3.3'
v1.3.3
author
Steve Sutton
<steve@gaslightmedia.com>
Thu, 1 Sep 2016 15:16:32 +0000
(11:16 -0400)
committer
Steve Sutton
<steve@gaslightmedia.com>
Thu, 1 Sep 2016 15:16:32 +0000
(11:16 -0400)
1
2
index.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
index.php
index
daa3705
,
4d772b8
..
7bd5389
---
1
/
index.php
---
2
/
index.php
+++ b/
index.php
@@@
-3,7
-3,7
+3,11
@@@
* Plugin Name: GLM Members Database Events
* Plugin URI: http://www.gaslightmedia.com/
* Description: Gaslight Media Members Database.
++<<<<<<< HEAD
+ * Version: 1.3.2
++=======
+ * Version: 1.3.3
++>>>>>>> release/1.3.3
* Author: Chuck Scott
* Author URI: http://www.gaslightmedia.com/
* License: GPL2