Merge branch 'release/1.2.0' v1.2.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Oct 2016 15:21:21 +0000 (11:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Oct 2016 15:21:21 +0000 (11:21 -0400)
commita3733ecdf76026855c26c8ffe5b66f0a7413a5fe
tree91c4fe770116724f24e8840702796fd21a5fc1ce
parentf90b9bc20ec18a83ba6e1b4f1f3711e537d37024
parenta3866bba5617fede0dbe2ee8071a55a2a0f60093
Merge branch 'release/1.2.0'