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
..
src	Merge branch 'master' into background-javascript	2017-02-25 15:26:55 +01:00
build.gradle	bump version, update changelog	2017-02-20 22:19:16 +01:00
proguard-rules.pro	First checkin of actual code	2015-01-07 14:00:18 +01:00