Merge branch 'hotfix/1.0.2' v1.0.2
authorIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 12:45:10 +0000 (08:45 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 12:45:10 +0000 (08:45 -0400)
commit65c6d3fb4230b0625cc8267b3ea553e82459e6a1
tree688e5667877b7dd294bac9a8d53ea185f9b42947
parentb4eea6255286ea1c2acfa0f71efb9a760a42dbf0
parentde019954378b08ef5809967eb861c693d775c48c
Merge branch 'hotfix/1.0.2'