Merge tag 'v1.1.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:12:17 +0000 (15:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:12:17 +0000 (15:12 -0400)
commit175b65ab783fbc78f9556d8c28ed9b46a1e067c4
tree6df9126650efd6b99bcf733a885cf3c09ed81251
parentb1f8daf6b00b9bdc36f30bca9d83f784326ed81f
parent890dcdaf93a0421a4f17dfed7a9f8ed7912fb9ec
Merge tag 'v1.1.6' into develop

v1.1.6