Merge branch 'hotfix/1.0.24' v1.0.24
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jul 2016 13:38:09 +0000 (09:38 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jul 2016 13:38:09 +0000 (09:38 -0400)
commitdf37771970168a9217a423035fe18d3ed4209a70
tree67dc49f2cc326a5465f73fa92e043582f01cbe16
parent344ba47dd413d418aa2b075017d4078607bae987
parent4785e28d184c815779303a864c32cb868f9266de
Merge branch 'hotfix/1.0.24'