projects / WP-Themes / jollylama.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b85f79 6dd7100)
Merge branch 'hotfix/1.1.1' v1.1.1
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 15:49:26 +0000 (11:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 15:49:26 +0000 (11:49 -0400)

Trivial merge