|
|
f155b2b627
|
Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile
# Conflicts:
# Assets/Plugins/Android/AndroidManifest.xml
# Assets/Plugins/Android/AndroidManifest.xml.meta
# Assets/Plugins/iOS.meta
# Assets/Scripts/App.cs
# Assets/Scripts/Devices/MainDeviceAdapter.cs
# Assets/Scripts/Scenes/LoginController.cs
# Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
|
2021-08-25 10:23:51 +08:00 |
|