Merge branch 'hotfix/2.0.5' v2.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:47:54 +0000 (13:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:47:54 +0000 (13:47 -0400)
commit47b864a7b6645c21f6c498c0945e2d041d205f7e
tree117c7c491aad6e2933c9c8f56c0fcffb528c19ef
parent7f37cb3b932ca7699d257fea3adfb3c3eeb3ec56
parent551007504f86f4112331a011db7500eb954a0b19
Merge branch 'hotfix/2.0.5'