mamutcho 10bf452017 Merge branch 'master' of https://codeberg.org/Freeyourgadget/Gadgetbridge ... Conflicts: GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java app/src/main/res/values-bg/strings.xml		2020-03-13 19:08:34 +02:00
..
src	Merge branch 'master' of https://codeberg.org/Freeyourgadget/Gadgetbridge	2020-03-13 19:08:34 +02:00
build.gradle	bump gradle and com.google.android.material	2020-02-27 12:32:30 +01:00
proguard-rules.pro	Added a base set of Proguard rules in case optimization is enabled	2020-01-31 18:43:38 +01:00