projects / WP-Themes / francejourneys.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f99b9c6 4efe201)
Merge branch 'hotfix/1.0.20' v1.0.20
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:27:35 +0000 (15:27 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:27:35 +0000 (15:27 -0500)

Trivial merge