Merge branch 'hotfix/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 16:31:27 +0000 (11:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 16:31:27 +0000 (11:31 -0500)
commit1446b003b7f68ed75de64d19b17685808b125ef0
tree6f6dc11ad162ed96c8dbed5cfbc9b402716246ed
parent23e51092cdf45e5dfce1275eb2261d28fab2d289
parentd76629578944a1eed8a1d341732677080cf9affb
Merge branch 'hotfix/1.2.1'