projects / WP-Plugins / glm-member-db-events.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6edd94 9f02244)
Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db-events...
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 4 Apr 2016 20:29:12 +0000 (16:29 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 4 Apr 2016 20:29:12 +0000 (16:29 -0400)
1  2 
classes/data/dataEvents.php patch | diff1 | diff2 | blob | history
views/admin/events/edit.html patch | diff1 | diff2 | blob | history

diff --cc classes/data/dataEvents.php
Simple merge
diff --cc views/admin/events/edit.html
Simple merge