Merge branch 'develop' into hotfix/1.2.7
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 15:38:43 +0000 (11:38 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 15:38:43 +0000 (11:38 -0400)
commitbc3e70c5185beea6f0b4a05a975d0b2fc04e7a08
tree1570a525ce56f95c1a91330beb39cf2ed056def0
parent7e46a26752d350498cfa29cf659482efbbd1ddd0
parent9c4e132e2b3b4ed985292a27c9a4b48baf62f019
Merge branch 'develop' into hotfix/1.2.7