Merge branch 'hotfix/1.1.6' v1.1.6
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:12:11 +0000 (15:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:12:11 +0000 (15:12 -0400)
commit890dcdaf93a0421a4f17dfed7a9f8ed7912fb9ec
tree6df9126650efd6b99bcf733a885cf3c09ed81251
parent800023dd4e5db8d9e6ff1d1abd9f99b5de94ee99
parent253083ca7e1450db0b4b4a37e06d887492c72b29
Merge branch 'hotfix/1.1.6'