Merge tag 'v1.2.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 21:57:57 +0000 (16:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 21:57:57 +0000 (16:57 -0500)
commitf127bf0117091bdc2a3fabaea817060894078b8b
tree3e50c3e559f40f27e289339c84a6fd4607bbf477
parent2a9aa0d17c59b3e7be32b357ce27b61676f43e21
parent5ba08e8499ccefe18dd2c2a1efce8fe1682ba732
Merge tag 'v1.2.17' into develop

v1.2.17