projects / web / CityofMI.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1db2a42 95f19e9)
Merge branch 'hotfix/1.1.7' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 21 Aug 2014 20:24:33 +0000 (16:24 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 21 Aug 2014 20:24:33 +0000 (16:24 -0400)

Trivial merge