Merge branch 'hotfix/1.1.5' v1.1.5
authorIan Weller <ian@gaslightmedia.com>
Fri, 4 Nov 2016 14:25:33 +0000 (10:25 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 4 Nov 2016 14:25:33 +0000 (10:25 -0400)
commit47922f0c4e89a628dec4c9c61c8d8b4038ea1834
treeafff28fc45813bab2e525be73f44d4d3d0587a0b
parentcb768c49df915607ea0e2ced47736f2d17132485
parent321d8a398241582386ea468bf61b28174d71bbe9
Merge branch 'hotfix/1.1.5'