Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 15:15:07 +0000 (11:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 15:15:07 +0000 (11:15 -0400)
commit537a88d1849a66c5a76b7dc53264393c82bb74ef
tree70555e3b031bdc3146e2b908112a5303e51b0b89
parent6e67e44e0e3d26f2396fc6aaa326286b8ed571f6
parente3c00ebd185626b9e6718db7d170d1d592566ff0
Merge branch 'hotfix/1.0.18'