Merge branch 'hotfix/1.0.28' v1.0.28
authorLaury GvR <laury@gaslightmedia.com>
Tue, 2 Aug 2016 14:49:43 +0000 (10:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 2 Aug 2016 14:49:43 +0000 (10:49 -0400)
commit5839e940371f524d281f2a1075cf3fe14119f1c5
tree8feae903c1a0e56c4d7beff18f5e59536d09b9d8
parent9da7fe469f01eb23dfac77c13bb091d5f74393fd
parent86b10eace72070c7057277a605055642783477d6
Merge branch 'hotfix/1.0.28'