merged latest from develop

2020-06-13 18:07:21 -07:00 · 2020-06-13 18:07:21 -07:00 · 83f66d33f7
commit 83f66d33f7
parent 23d957679e e18ffaafce
16 changed files with 81 additions and 83 deletions
--- a/daemon/core/emulator/emudata.py
+++ b/daemon/core/emulator/emudata.py
@ -68,7 +68,7 @@ class LinkOptions:
    session: int = None
    delay: int = None
    bandwidth: int = None
-    per: float = None
+    loss: float = None
    dup: int = None
    jitter: int = None
    mer: int = None