Merge remote-tracking branch 'root/master' into dev1.2

Browse Source

# Conflicts:
#	meshtastic/mesh_pb2.py
#	meshtastic/portnums_pb2.py
#	setup.py

...

This commit is contained in:

Kevin Hester committed 2021-03-03 11:16:32 +08:00

2 parents f763e168d9 ba81714d2c

commit 3b8136d769

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