Merge tag 'v1.2.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 20:40:11 +0000 (15:40 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 20:40:11 +0000 (15:40 -0500)
commitafe0c010bd9bbce62af71c421fa83954515ffcd6
tree96ebec456014c45b0cf1ed03d9e983bc537ce831
parenta266974e6ce5dbdedf4dbce6c398a145fb09bec2
parent77bfb8f00290a952a30cca1fa8c40beb8d0f912c
Merge tag 'v1.2.6' into develop

v1.2.6