update from master

This commit is contained in:
Kevin Hester
2021-03-02 15:25:29 +08:00
parent dfb6fb7548
commit 257620e992
10 changed files with 699 additions and 319 deletions

View File

@@ -12,7 +12,11 @@ with open("README.md", "r") as fh:
# This call to setup() does all the work
setup(
name="meshtastic",
<<<<<<< HEAD
version="1.2.00",
=======
version="1.1.50",
>>>>>>> dev
description="Python API & client shell for talking to Meshtastic devices",
long_description=long_description,
long_description_content_type="text/markdown",