From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 20 Aug 2018 12:25:33 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.1'
X-Git-Tag: v1.2.1^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2357455d73f0a40590fdb5f13b76067222d41ee0;p=web%2FCityofMI.git

Merge branch 'hotfix/1.2.1'
---

2357455d73f0a40590fdb5f13b76067222d41ee0