projects / WP-Themes / jollylama.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 047d218 1a2bf9d)
Merge branch 'hotfix/1.1.2' v1.1.2
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 18:11:46 +0000 (14:11 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 18:11:46 +0000 (14:11 -0400)

Trivial merge