Merge branch 'hotfix/1.2.8' v1.2.8
authorLaury GvR <laury@gaslightmedia.com>
Fri, 15 Dec 2017 21:59:15 +0000 (16:59 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 15 Dec 2017 21:59:15 +0000 (16:59 -0500)
commitd138aec832441b226bf4193c365c8a2c02a13855
tree19194ed2adc19f6f153db3bdbcc15bca4787d129
parentcc73f06086ff7f49cd97d3ba7d62f0b24f23b9cd
parente73d9ca9288baa7e205f89ed634538fe131767e8
Merge branch 'hotfix/1.2.8'