no use JoinThread
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
show detail class & function name on conversion error
Merge branch 'more_details_for_conversion_error_msg' of https://github.com/edwardzhou/cocos2d-x into v3_conversion
Reset Webscoket
Add more useful tip for error log
Update bindings-generator submodule
Merge pull request #7556 from Dhilan007/v3

fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments.
[ci skip]
Add more useful tip for error log
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_conversion
Add more useful tip for error log
Merge pull request #7562 from samuele3hu/v3_conversion

Show detail class & function name on conversion error and update bindings-generator submodule