Merge branch 'release/1.2.6' v1.2.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 20:40:06 +0000 (15:40 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 20:40:06 +0000 (15:40 -0500)
commit77bfb8f00290a952a30cca1fa8c40beb8d0f912c
tree96ebec456014c45b0cf1ed03d9e983bc537ce831
parente62a7eb5ca972d4bf0110e758e03fe7f47ad2729
parent7815a714f720992273fb360da8b10a1be4cf2e2e
Merge branch 'release/1.2.6'