1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-01-20 22:57:34 +01:00
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
..
2018-02-26 14:27:33 +01:00
2019-01-07 01:15:49 +01:00
2018-02-26 14:27:33 +01:00
2018-09-15 23:54:51 +02:00
2019-01-07 01:15:49 +01:00
2019-01-07 01:15:49 +01:00
2019-01-11 22:28:36 +01:00
2018-02-26 14:27:33 +01:00
2018-02-26 14:27:33 +01:00
2018-06-25 18:35:46 +02:00