Merge tag 'v1.1.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:29:57 +0000 (16:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:29:57 +0000 (16:29 -0400)
commit35e3eecbda20bc1a3c40b86941e35cf0e9f4b7ac
tree4ae91cd91d550d1c58ecf22627fb1b304174397a
parentd74c47eb56d30b7d6b814c9075da696aa93aaebb
parent712729b98e8cd5080ebeba8b71a3a2d9a3d43561
Merge tag 'v1.1.18' into develop

v1.1.18