projects / WP-Themes / francejourneys.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4714e34 980702a)
Merge branch 'hotfix/1.0.21' v1.0.21
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 21:26:10 +0000 (16:26 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 21:26:10 +0000 (16:26 -0500)

Trivial merge