1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-06-25 22:40:05 +02:00
Gadgetbridge/app/src
abettenburg 51399066a4 Merge remote-tracking branch 'upstream/master' into black_whitelist_for_notifications
# Conflicts:
#	app/src/main/res/values/strings.xml
2019-01-12 09:55:53 +01:00
..
main Merge remote-tracking branch 'upstream/master' into black_whitelist_for_notifications 2019-01-12 09:55:53 +01:00
test Merge remote-tracking branch 'upstream/master' into black_whitelist_for_notifications 2019-01-12 09:55:53 +01:00