projects / WP-Themes / jollylama.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47922f0 9c6ad58)
Merge branch 'hotfix/1.1.6' v1.1.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 4 Nov 2016 15:05:55 +0000 (11:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 4 Nov 2016 15:05:55 +0000 (11:05 -0400)

Trivial merge