projects / WP-Themes / alpenfest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1e6481 8e7b198)
Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Jan 2016 14:02:47 +0000 (09:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Jan 2016 14:02:47 +0000 (09:02 -0500)

Trivial merge