projects / web / MichiganTrailMaps.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cff1600 14d0774)
Merge branch 'release/1.1' v1.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Oct 2014 20:06:48 +0000 (16:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Oct 2014 20:06:48 +0000 (16:06 -0400)

Trivial merge