Merge tag 'v1.2.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 15:58:23 +0000 (10:58 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 15:58:23 +0000 (10:58 -0500)
commit5a34eaf2ee439c1116121ce0ca2439c908be8e82
tree614c3b67c0d458ca416c320a69fdf8feb2031e1d
parentf05d1aac598dd6f6eb1afe6f82147d79adc87476
parent23e51092cdf45e5dfce1275eb2261d28fab2d289
Merge tag 'v1.2.0' into develop

Version 1.2.0