projects / WP-Themes / parrotslanding.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f2c53c 91b293f)
Merge branch 'hotfix/1.0.12' v1.0.12
authorIan Weller <ian@gaslightmedia.com>
Wed, 21 Jun 2017 20:17:02 +0000 (16:17 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 21 Jun 2017 20:17:02 +0000 (16:17 -0400)

Trivial merge