projects / web / MichiganTrailMaps.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02861b2 69613c3)
Merge branch 'release/1.2.5' v1.2.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Apr 2016 16:48:23 +0000 (12:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Apr 2016 16:48:23 +0000 (12:48 -0400)

Trivial merge