projects / WP-Themes / jollylama.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8d356d 71e0890)
Merge branch 'hotfix/1.1.7' v1.1.7
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:52:53 +0000 (15:52 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:52:53 +0000 (15:52 -0500)

Trivial merge