Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 18:07:15 +0000 (13:07 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 18:07:15 +0000 (13:07 -0500)
commit7b033f1894a06ff255a4e86365c12cc759949cdb
treecd5d0c92d042b4efd4779a899346343d5380b96f
parentd983fec9599ed6fa5a83b833302a7ec19890e345
parent4e3615f4136c156ae4099a2ad147dc33eacabe2e
Merge branch 'hotfix/1.0.4'