• HD's avatar
    Merge remote-tracking branch 'origin/dev_php' into dev_hotfix · 0d687cbc
    HD authored
    # Conflicts:
    #	GameSDK_API/src/main/assets/dwg_version_config.json
    #	GameSDK_Channels/GameSDK_Channel_Common_Base/build.gradle
    #	GameSDK_Channels/GameSDK_Channel_Common_Base/src/main/java/com/dwg/sdk/common/channel/func/CommonParams.java
    #	GameSDK_Channels/GameSDK_Channel_Common_Base/src/main/java/com/dwg/sdk/common/channel/utils/SDKUtil.java
    0d687cbc