projects / web / MichiganTrailMaps.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e9dfed 7bae351)
Merge branch 'hotfix/1.2.6' v1.2.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 20:54:48 +0000 (16:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 20:54:48 +0000 (16:54 -0400)

Trivial merge