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
..
main	Merge branch 'master' into background-javascript	2017-02-25 15:26:55 +01:00
test/java/nodomain/freeyourgadget/gadgetbridge	Add transliteration test	2017-01-25 00:04:05 +03:00