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
..
src	Merge remote-tracking branch 'origin/master' into background-javascript	2017-01-28 17:43:34 +01:00
build.gradle	bump version, update changelog	2017-01-25 22:15:21 +01:00
proguard-rules.pro	First checkin of actual code	2015-01-07 14:00:18 +01:00