projects / WP-Themes / jollylama.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb768c4 321d8a3)
Merge branch 'hotfix/1.1.5' v1.1.5
authorIan Weller <ian@gaslightmedia.com>
Fri, 4 Nov 2016 14:25:33 +0000 (10:25 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 4 Nov 2016 14:25:33 +0000 (10:25 -0400)

Trivial merge