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
..
src	Merge branch 'master' into background-javascript	2017-04-08 21:16:01 +02:00
build.gradle	Update to mpandroidchart 3.0.2	2017-04-01 23:57:12 +02:00
proguard-rules.pro	First checkin of actual code	2015-01-07 14:00:18 +01:00