projects / web / TroutCreek.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fff175 76d5fc2)
Merge branch 'release/1.2.15' v1.2.15
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jun 2017 18:50:50 +0000 (14:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jun 2017 18:50:50 +0000 (14:50 -0400)

Trivial merge