projects / WP-Themes / jollylama.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7da06ce c430cc2)
Merge branch 'master' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 23 Apr 2018 21:28:35 +0000 (17:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 23 Apr 2018 21:28:35 +0000 (17:28 -0400)

Trivial merge