Merge branch 'hotfix/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:21:21 +0000 (10:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:21:21 +0000 (10:21 -0400)
commit8c0a45dd65a413f92274bb4a5b74627cf3545551
tree1c0330522525dfcf255dec9178076a17daae2a01
parent532a44e15357588254cf11a4186358a193169d62
parent4d9cc48b7221dd1013564e3294ee64395fff3ae3
Merge branch 'hotfix/1.0.17'