mamutcho 61da55e0de Merge branch 'master' of https://codeberg.org/Freeyourgadget/Gadgetbridge ... Conflicts: GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java		2020-04-20 14:42:20 +03:00
..
src	Merge branch 'master' of https://codeberg.org/Freeyourgadget/Gadgetbridge	2020-04-20 14:42:20 +03:00
build.gradle	Bump version, update CHANGELOG	2020-04-11 01:22:28 +02:00
proguard-rules.pro	Added a base set of Proguard rules in case optimization is enabled	2020-01-31 18:43:38 +01:00