Merge branch 'hotfix/1.0.5' master v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 18:09:23 +0000 (13:09 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 18:09:23 +0000 (13:09 -0500)
commit2950e2a51e38b060acac06fd1460682efb3e98b9
treeb6e75a6d1901431af57f33265baecbd6a58812e1
parent7b033f1894a06ff255a4e86365c12cc759949cdb
parent4f8b3144b7acfb4f588ef3aba5c5d6b1dbafbd49
Merge branch 'hotfix/1.0.5'