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

..

src

Merge branch 'master' into background-javascript

2017-09-03 16:49:27 +02:00

build.gradle

bump version, update CHANGELOG

2017-09-03 14:20:40 +02:00

proguard-rules.pro

First checkin of actual code

2015-01-07 14:00:18 +01:00