Da Pa
|
35dbbd6a31
|
Merge branch 'master' into y5_patch_test
# Conflicts:
# GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
# app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30/TeclastH30Coordinator.java
# app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
# app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
# app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java
# app/src/main/res/values/strings.xml
|
2020-01-01 06:55:54 +02:00 |
|