Gadgetbridge/app/src/main/assets/app_config
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
..
js Merge branch 'master' into background-javascript 2017-02-25 15:26:55 +01:00
configure.html app: Random typo and consistency fixes. 2016-12-01 20:22:12 +01:00