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:25:37 +02:00

parent bf3889e519 abd5088456

commit 224fdc7185

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

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

Diff Content Not Available