Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WorkProgress

...

This commit is contained in:

mamutcho

2019-11-08 19:27:53 +02:00

parent 224fdc7185 3b5ce7ba53

commit 19171696c6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available