From: Laury GvR Date: Mon, 23 Apr 2018 21:28:35 +0000 (-0400) Subject: Merge branch 'master' into develop X-Git-Tag: v1.1.10^2~2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=49d3acb3078e836e3d074b7095811bf71a93252f;p=WP-Themes%2Fjollylama.git Merge branch 'master' into develop --- 49d3acb3078e836e3d074b7095811bf71a93252f