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
..
2016-11-13 01:44:52 +01:00
2019-12-24 01:27:57 +01:00
2019-11-23 21:53:22 +01:00
2019-02-13 20:43:31 +01:00
2019-02-13 20:43:31 +01:00
2019-02-13 20:43:31 +01:00
2019-11-23 21:53:22 +01:00
2019-12-08 11:52:48 +01:00
2019-02-13 20:43:31 +01:00
2020-01-01 06:55:54 +02:00
2019-02-28 21:57:45 +01:00
2019-02-13 20:43:31 +01:00
2019-11-23 21:53:22 +01:00
2019-02-13 20:43:31 +01:00
2019-11-23 21:53:22 +01:00
2019-02-13 20:43:31 +01:00
2019-02-13 21:01:14 +01:00
2019-12-06 22:51:43 +01:00
2019-02-13 20:43:31 +01:00
2019-02-13 20:43:31 +01:00
2019-02-13 20:43:31 +01:00
2019-02-13 21:01:14 +01:00
2019-11-23 21:53:22 +01:00
2019-02-13 20:43:31 +01:00
2019-02-13 20:43:31 +01:00
2019-02-13 20:43:31 +01:00
2019-02-13 20:43:31 +01:00
2019-11-23 21:53:22 +01:00
2019-11-23 21:53:22 +01:00