Merge branch 'release/1.2.0' v1.2.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 15:58:17 +0000 (10:58 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 15:58:17 +0000 (10:58 -0500)
commit23e51092cdf45e5dfce1275eb2261d28fab2d289
tree614c3b67c0d458ca416c320a69fdf8feb2031e1d
parent4081d0c5291934b11137bb5170ef9d9561029a96
parentaeaef851ad3525fd359f3f4741cd19954df60870
Merge branch 'release/1.2.0'