Merge tag 'v1.2.0' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 22 Feb 2017 19:29:50 +0000 (14:29 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 22 Feb 2017 19:29:50 +0000 (14:29 -0500)
commit59acd1948ac291cb6f09d5ed040a124ec58f7007
tree62340c5a82231b8d23d6d99fd3106a08e309b987
parentd7ba492d5798c99472a6869e95ed48f4f64446eb
parent3cfaf4b08d3719ebbcc67373afa031be1a4087ab
Merge tag 'v1.2.0' into develop

Update to 1.2.0