Merge branch 'hotfix/1.6.1' v1.6.1
authorLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 16:09:43 +0000 (12:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 16:09:43 +0000 (12:09 -0400)
commitf6645b780501be9ce4b57a19bb5b233971141acb
tree1a48fa7b16e6e14e8ce82dc06c43aa59fa3f156d
parent4c6e5434be947a7ee3f465a4720f9e7155ca02d0
parent11be1c89165f62e67edcd3f56c28038d7ab89bda
Merge branch 'hotfix/1.6.1'