Daniele Gobbetti 6c993d40aa Merge branch 'master' into background-javascript ... # Conflicts: # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java		2017-02-25 15:26:55 +01:00
..
gadgetbridge_boilerplate.js	Merge branch 'master' into background-javascript	2017-02-25 15:26:55 +01:00
Uri.js	Initial support for using an external browser for configuring pebble apps. This allows existing configuration pages to work without having internet access ourselves.	2016-03-02 21:07:27 +01:00