projects / WP-Themes / jollylama.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95c5d2a 2dff142)
Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:46:37 +0000 (09:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:46:37 +0000 (09:46 -0400)

Trivial merge