Merge branch 'hotfix/1.1.12' v1.1.12
authorLaury GvR <laury@gaslightmedia.com>
Wed, 2 Nov 2016 13:06:34 +0000 (09:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 2 Nov 2016 13:06:34 +0000 (09:06 -0400)
commit9126ee23470d4f38ebb679beda343ef885ced858
tree9673a85c5fd79dbed6ad3d7cff9592079feb7e36
parentdf211989a20eda2f5f44540e38af5526003a37aa
parent081b098eb58b4883b7f194a3db80246401a2e3d6
Merge branch 'hotfix/1.1.12'