projects / WP-Themes / alpenfest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b7a78c 3656af6)
Merge branch 'hotfix/1.0.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Jun 2015 22:25:52 +0000 (18:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Jun 2015 22:25:52 +0000 (18:25 -0400)

Trivial merge