Merge remote-tracking branch 'origin/master'
authork.liang <liangkang648253071@126.com>
Wed, 23 Feb 2022 09:36:26 +0000 (17:36 +0800)
committerk.liang <liangkang648253071@126.com>
Wed, 23 Feb 2022 09:36:26 +0000 (17:36 +0800)
commit2835913bd3516e34c9df2730198c7c5332e4829f
tree7dcab65bb945fb102f2e7be5f1e9e357a97ca2a7
parent0039d73b0824debe7c3e22727b1e1be2440fa6e7
parent44627cd935b5139eda0de1c649b8c6d5783dde7f
Merge remote-tracking branch 'origin/master'

# Conflicts:
# app/release/output-metadata.json
# app/version_code.properties
app/src/main/java/com/ic/temperature/viewmodel/TemperatureViewModel.kt