Merge tag 'V1.1.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:10:07 +0000 (09:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:10:07 +0000 (09:10 -0500)
commit78cb31d60845624d94892aeb86125c42284e0ea5
tree50f0135abda00df9c538c4cfbcc31ccbcd1637f8
parent76e986a6b6400f8a4a8d16e206fca8dd74bf1c50
parentc7150f1b0af3a1970c384a0f505e1f3fdab84e1f
Merge tag 'V1.1.7' into develop

v1.1.7