dakhnod 1e2b0ce242 Merge remote-tracking branch 'origin/fossil-q-hr' into fossil-q-hr ... # Conflicts: # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java		2020-01-02 02:08:46 +01:00
..
src	Merge remote-tracking branch 'origin/fossil-q-hr' into fossil-q-hr	2020-01-02 02:08:46 +01:00
build.gradle	bump version, add changelog (WIP)	2019-12-27 23:14:00 +01:00
proguard-rules.pro	First checkin of actual code	2015-01-07 14:00:18 +01:00