projects / WP-Themes / camppetosega.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6617e5 4f9e1a9)
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)
merging all changes from develop onto master, changed permalink values to match the campground pages on the live site


Trivial merge