Merge branch 'develop' into hotfix/1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 14:19:03 +0000 (09:19 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 14:19:03 +0000 (09:19 -0500)
commit330ebc4bfc33589c30972660bea6f5f640a9b45d
tree001be482c89839353a5da7cdfe11c5d2aa89b396
parent49220182528b1e4d95a1f63d74378c0fd6fbfa07
parente5c7985f457ac5fa6a99eaa4b9069bb966a9c019
Merge branch 'develop' into hotfix/1.0.5