Merge branch 'hotfix/1.2.29' v1.2.29
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 20 Jul 2017 15:40:53 +0000 (11:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 20 Jul 2017 15:40:53 +0000 (11:40 -0400)
commit6522abf0a0e4b07e78322f0e07ade7d1a28adc36
tree902c11ac6b0765be0bc06ae276f15ba586edd6a5
parent2aea54c51bcc448b951252fe47d2c60762222e1c
parent90e6f75dc8e2a9bf6e1ef8a270d15bc2c30a02c3
Merge branch 'hotfix/1.2.29'