Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:26:58 +0000 (11:26 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:26:58 +0000 (11:26 -0400)
commit9afe35095cfedd6f1c4490a768a9bdff60a7b239
tree3641361f4e620a20fc524219601e8bfd578aa919
parentc003bbb67c02120cd1868082567cd9dcfefb08ee
parentbfa15eb07e9084d81b4604f5a4acebce08f536d0
Merge branch 'hotfix/1.0.12'