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
..
nodomain/freeyourgadget/gadgetbridge	Merge branch 'master' into background-javascript	2017-02-25 15:26:55 +01:00
ru/gelin/android/weather/notification	Pebble: get min/max temperature also for the forecast	2016-12-30 19:58:56 +01:00