projects / WP-Themes / jollylama.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0cbced 1019515)
Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 14:14:09 +0000 (10:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 14:14:09 +0000 (10:14 -0400)

Trivial merge