Merge branch 'hotfix/1.1.20' V1.1.20
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:12:38 +0000 (11:12 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:12:38 +0000 (11:12 -0500)
commita79734204d3709f1193068ec5ebb72dcf8887c0c
tree38f6d1d9d3812b2105c61bcb6ed928a4dc2bc900
parent8582b53b5f19e8e9262f5bf44548f983ff0347dd
parentbacf1d0ab23d50b003c60f1d155f02f31c1a5ce2
Merge branch 'hotfix/1.1.20'