Merge branch 'hotfix/1.0.15' v1.0.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Aug 2017 16:54:08 +0000 (12:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Aug 2017 16:54:08 +0000 (12:54 -0400)
commit141d72f1af5bd8b846c6a7c01de18a5f5645a590
treedf8500ab380682a01e7bdbdb00ddec291d3e560a
parent2a0afabfedb12849a7402df2a1facbc80b8d9b09
parentd07b3b5bbb7d7141f11629899fea76feafcd146e
Merge branch 'hotfix/1.0.15'