Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Mon, 21 Aug 2017 16:24:28 +0000 (12:24 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 21 Aug 2017 16:24:28 +0000 (12:24 -0400)
commiteb4ce002d9c56665a27974ca576493805a3d16ad
treecd5a483134ba6cc9311e277dc10be8e24ac904af
parent3a1415e923eab4e29b606ef0cbe31a160e37ed1b
parent78021588bdbc228cd562d6e5542be33e9dd9bdc8
Merge branch 'hotfix/1.0.12'