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)
commit75e03ea720e197800eeea22ee2eafb9c63e536d7
treeb47b2b526ecefe8eeff3ebd0d5cac53d6e041fd1
parent1c08e60a9a430b15d59912dcf54edd6a45daf346
parent01d53808d5f63359cfab86546a307a9cbaf3c4f3
Merge branch 'master' into release/1.2.39

Conflicts:
header.php
style.css
header.php