Merge remote-tracking branch 'origin/master' into develop
2 files changed, 2 insertions(+), 2 deletions(-) M requirements-dev.txt M requirements.txt
M requirements-dev.txt => requirements-dev.txt +0 -2
@@ 4,7 4,5 @@ # Python development requirements nose2 flake8 -hid pep8-naming -pyusb yapf
M requirements.txt => requirements.txt +2 -0
@@ 3,7 3,9 @@ appdirs argcomplete colorama dotty-dict +hid hjson jsonschema>=3 milc>=1.3.0 pygments +pyusb