Merge branch 'hotfix/2.0.4' v2.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 23 Mar 2016 19:54:47 +0000 (15:54 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 23 Mar 2016 19:54:47 +0000 (15:54 -0400)
commit7f37cb3b932ca7699d257fea3adfb3c3eeb3ec56
tree3d9162155e595dafcce35eb70a225906712eba53
parentbba23ac086053963db84b301d5076a1753a1a995
parent902c45a4848544f0c1ec1059ef8c47702b3b0f96
Merge branch 'hotfix/2.0.4'