projects / WP-Themes / jollylama.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35067d7 895c771)
Merge branch 'hotfix/1.0.1' v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:35:37 +0000 (09:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:35:37 +0000 (09:35 -0400)

Trivial merge