projects / WP-Plugins / glm-member-db-events.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ffca09 ae97f07)
Merge branch 'develop' into feature/steve
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 31 Mar 2016 20:51:25 +0000 (16:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 31 Mar 2016 20:51:25 +0000 (16:51 -0400)
1  2 
classes/data/dataEvents.php patch | diff1 | diff2 | blob | history
setup/validActions.php patch | diff1 | diff2 | blob | history

diff --cc classes/data/dataEvents.php
Simple merge
diff --cc setup/validActions.php
Simple merge