Merge branch 'hotfix/1.1.11'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:49:35 +0000 (16:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:49:35 +0000 (16:49 -0400)
commit4c76229be210ae6037a9f22d6bf6bc23d903e604
treebc27206786aeda824b05b75dd4cd5eaf31e6ad9b
parent3886e6cc17fd5a56053581621343a0da02a3d8d5
parente874a4afedf1046bef54acc4e0dec5bc88d5580a
Merge branch 'hotfix/1.1.11'