projects / WP-Themes / jollylama.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c599064 efe460a)
Merge branch 'hotfix/1.1.8' v1.1.8
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 16:58:27 +0000 (11:58 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 16:58:27 +0000 (11:58 -0500)

Trivial merge