Merge branch 'hotfix/1.0.30' v1.0.30
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 23 Nov 2016 21:01:58 +0000 (16:01 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 23 Nov 2016 21:01:58 +0000 (16:01 -0500)
commit68962b3c81e27f4c623f4f741113b092bcc06831
tree4cad49a34f264d5dae9d05e10af6228da1f271c9
parent1853f932e736d3f149b5855e0d4a7730e38b6f51
parent64cfc58a0759f0b5f898c2ebf0d05d5a448e21bd
Merge branch 'hotfix/1.0.30'