Merge tag 'v1.0.25' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 10 Aug 2016 16:46:38 +0000 (12:46 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 10 Aug 2016 16:46:38 +0000 (12:46 -0400)
commitf5ae886853f8a4dbb25a6209f5fda1dac7144dd8
treebb8d187cac88c30a26c6456f137a7d3b49db408c
parente6617e55b0f87dfb55c1b10a6a82e0d1bb7522cb
parent4f9e1a92af7c7454983d824a94ed887523534f01
Merge tag 'v1.0.25' into develop

merging all changes from develop onto master, changed permalink values to match the campground pages on the live site