Daniele Gobbetti 6ebc727f97 Merge remote-tracking branch 'origin/master' into low_battery_notification ...

Conflicts:
	app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java

2015-08-24 17:48:17 +02:00

..

src

Merge remote-tracking branch 'origin/master' into low_battery_notification

2015-08-24 17:48:17 +02:00

build.gradle

bump version, update CHANGELOG.md

2015-08-22 22:36:32 +02:00

proguard-rules.pro

First checkin of actual code

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