projects / WP-Themes / jollylama.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3de5ae 164c448)
Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:36:40 +0000 (16:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:36:40 +0000 (16:36 -0400)

Trivial merge