Daniele Gobbetti bb962001a5 Merge branch 'master' into background-javascript ... # Conflicts: # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java		2017-09-03 16:49:27 +02:00
..
main	Merge branch 'master' into background-javascript	2017-09-03 16:49:27 +02:00
test/java/nodomain/freeyourgadget/gadgetbridge	Pebble: preparations for js appmessage ack/nack callbacks	2017-08-01 00:03:28 +02:00