Merge branch 'hotfix/1.2.9' v1.2.9
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 15:39:24 +0000 (11:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 15:39:24 +0000 (11:39 -0400)
commite9f49d1ed520fd172b9158d0d0fcce82ece224e2
tree1570a525ce56f95c1a91330beb39cf2ed056def0
parent626b556e41ddb08e4f055be07112335162576a53
parentbc3e70c5185beea6f0b4a05a975d0b2fc04e7a08
Merge branch 'hotfix/1.2.9'