Merge branch 'master' into release/1.2.39
authorlaury <laury@gaslightmedia.com>
Fri, 9 Nov 2018 18:35:08 +0000 (13:35 -0500)
committerlaury <laury@gaslightmedia.com>
Fri, 9 Nov 2018 18:35:08 +0000 (13:35 -0500)
Conflicts:
header.php
style.css

1  2 
header.php

diff --cc header.php
Simple merge