Daniele Gobbetti 5c0c5581bb Merge branch 'master' into background-javascript ... # Conflicts: # app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java		2017-04-08 21:16:01 +02:00
..
gadgetbridge	Merge branch 'master' into background-javascript	2017-04-08 21:16:01 +02:00