projects / WP-Plugins / glm-member-db.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03847cb a0a688a)
Merge branch 'release/1.0.22'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 28 Sep 2015 16:55:36 +0000 (12:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 28 Sep 2015 16:55:36 +0000 (12:55 -0400)
Conflicts:
views/front/members/detail.html


Trivial merge