Merge branch 'hotfix/1.1.20' v1.1.20
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:40:55 +0000 (16:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:40:55 +0000 (16:40 -0400)
commitec81f9da0a793af612b70099474a2290d30f9fab
tree9096ffd8e5ee0f8dd8f4a8d1dea6d09729e0e671
parent0bc1cdde6a05084430ea5ffa3c17b3a4169723c8
parent2f2161f97534a75e0d6730be46e59fb50aead0b5
Merge branch 'hotfix/1.1.20'