Merge branch 'hotfix/1.0.26' v1.0.26
authorLaury GvR <laury@gaslightmedia.com>
Mon, 7 Nov 2016 21:40:36 +0000 (16:40 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 7 Nov 2016 21:40:36 +0000 (16:40 -0500)
commit3ea8fac924cc0b9ca9d99d4fc6dcc3544ec24ca7
tree3f9befdd3e9cb22af02a15af318774e11ede3454
parent3daa8570071ebad404483090c055280d36955f32
parent9025799971e3ceacb7d5f0173e99a28640f19d59
Merge branch 'hotfix/1.0.26'