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
..
main	Merge branch 'master' of https://codeberg.org/Freeyourgadget/Gadgetbridge	2020-03-13 19:08:34 +02:00
test	File external files dir creation, add test	2020-01-29 20:20:20 +01:00