From: Laury GvR Date: Tue, 12 Jul 2016 22:52:11 +0000 (-0400) Subject: Merge tag 'v1.0.43' into develop X-Git-Tag: v1.0.45^2~11 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4df5ada7332171c1894b2066aa62cbd2e4d49f90;p=WP-Themes%2Fsaultstemarie.git Merge tag 'v1.0.43' into develop v1.0.43 Conflicts: style.css --- 4df5ada7332171c1894b2066aa62cbd2e4d49f90