projects / WP-Plugins / glm-coupons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 065c3bb 28db81b)
Merge branch 'hotfix/1.1.7' master v1.1.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 17:36:59 +0000 (13:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 17:36:59 +0000 (13:36 -0400)

Trivial merge