Merge remote-tracking branch 'origin/master' into watchonly

2021-03-31 10:43:55 +01:00
parent 569f43fe81 510ccbc007
commit b05b8c0115
130 changed files with 6532 additions and 1003 deletions
@@ -24,11 +24,16 @@ quart-trio = "*"
 trio = "==0.16.0"
 hypercorn = {extras = ["trio"], version = "*"}
 sqlalchemy-aio = "*"
+<<<<<<< HEAD
 embit = "*"
+=======
+pyqrcode = "*"
+pypng = "*"
+>>>>>>> master

 [dev-packages]
 black = "==20.8b1"
 pytest = "*"
 pytest-cov = "*"
-mypy = "==0.761"
+mypy = "latest"
 pytest-trio = "*"