Merge branch 'hotfix/1.0.22' v1.0.22
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:35:01 +0000 (12:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:35:01 +0000 (12:35 -0400)
commita0d8e3e1d96fbbd68481561848ca68a1e83bac45
tree10921c65c7ae4ddce43b74a742d39e314d4f37ba
parentbdd41a5716cc5c08f14c4a5a9f48d4d04a85c595
parentd3d461fe5e16eeb132becafd3d529e5824177a4c
Merge branch 'hotfix/1.0.22'