projects / WP-Plugins / glm-member-db.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb49c61 2b9836b)
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 13 Dec 2016 18:31:10 +0000 (13:31 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 13 Dec 2016 18:31:10 +0000 (13:31 -0500)
1  2 
css/front.css patch | diff1 | diff2 | blob | history
setup/adminHooks.php patch | diff1 | diff2 | blob | history

diff --cc css/front.css
Simple merge
diff --cc setup/adminHooks.php
Simple merge