Merge branch 'release/1.2.18' v1.2.18
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Feb 2018 20:27:42 +0000 (15:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Feb 2018 20:27:42 +0000 (15:27 -0500)
commit35977b0507b3febf0325eaf1ccc1666046e6359b
tree35559d63b25b8d739d8a41a0ef36d8203e9402b7
parent5ba08e8499ccefe18dd2c2a1efce8fe1682ba732
parent43ee2fcd2d5ad48e016c2569cb7648b6ffdecec8
Merge branch 'release/1.2.18'