1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-02-12 18:06:47 +01:00
Daniele Gobbetti f66f765fb6 Merge remote-tracking branch 'origin/master' into background-javascript
# Conflicts:
#	app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
2017-01-28 17:43:34 +01:00
..