Merge branch 'hotfix/1.2.2'
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:10:40 +0000 (15:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:10:40 +0000 (15:10 -0400)
commitdf0c6ef1e479f590a752d6f409e10b5bbd1580f5
tree4ce52c6fb2c963b42db210403669e9f8b0de3b52
parentaf0e674833e4ecd1b90205212df362045d78f339
parent0944611b8edbb52c1d2a1cf2fbfe2aa7d0fadbfb
Merge branch 'hotfix/1.2.2'