Merge branch 'hotfix/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Oct 2016 15:26:49 +0000 (11:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Oct 2016 15:26:49 +0000 (11:26 -0400)
commit6a04b1a8ab60d99ebb0b675f12b02d05a74747bb
treeea750310d070807fc1842e32d732add817890889
parenta3733ecdf76026855c26c8ffe5b66f0a7413a5fe
parentd501756d488d003021d5562db42b2d8f4371322c
Merge branch 'hotfix/1.2.1'