projects / WP-Plugins / glm-blocks.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c57891 597dd33)
fix merge conflict
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 11 May 2015 15:40:03 +0000 (11:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 11 May 2015 15:40:03 +0000 (11:40 -0400)

Trivial merge