From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 29 Aug 2018 14:57:47 +0000 (-0400)
Subject: Merge branch 'release/1.0.25'
X-Git-Tag: v1.0.25
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f41432fea36962acb124746198fdc763afdce6f8;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'release/1.0.25'
---

d9b12f1054f6a6ff49a8fd83cbc0532764905296