Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test
authork.liang <liangkang648253071@126.com>
Fri, 15 Oct 2021 03:18:47 +0000 (11:18 +0800)
committerk.liang <liangkang648253071@126.com>
Fri, 15 Oct 2021 03:18:47 +0000 (11:18 +0800)
commit84ed1c8251610784afc19165d2b0188abad2ac2e
tree32d3029a963bd3a141bdab3711aa7cf5ef1805a9
parent5306cd45be9ea4f264c0bdcf833fc8620f288ad6
parentc6499320a5723a8bb5241b00c18d76eceafc12c5
Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test

# Conflicts:
# app/release/output.json
# app/version_code.properties