projects / web / Keweenaw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31798d6 2a19a0a)
Merge branch 'hotfix/1.3.11' v1.3.11
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 20:42:58 +0000 (15:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 20:42:58 +0000 (15:42 -0500)

Trivial merge