projects / web / Keweenaw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe8c3c1 fd944bf)
Merge branch 'hotfix/1.2' v1.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 18:59:59 +0000 (13:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 18:59:59 +0000 (13:59 -0500)

Trivial merge