Daniele Gobbetti bb962001a5 Merge branch 'master' into background-javascript ... # Conflicts: # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java		2017-09-03 16:49:27 +02:00
..
nodomain/freeyourgadget/gadgetbridge	Merge branch 'master' into background-javascript	2017-09-03 16:49:27 +02:00
ru/gelin/android/weather/notification	Pebble: further improvements to the background webview	2017-07-26 18:12:12 +02:00