Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 15:01:49 +0000 (10:01 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 15:01:49 +0000 (10:01 -0500)
commit82d4536ef40ca28486000208eb097191d47fae64
treedf9dcda86c527d34dbc5cc65df639b09002f74ab
parent760d3ad92f2e1558f57658faed771a17658f5410
parentd078574a24284524d1cb7c6072256f42deef0fd2
Merge branch 'hotfix/1.0.12'