summaryrefslogtreecommitdiff
path: root/requirements.txt
diff options
context:
space:
mode:
authorZach White <skullydazed@gmail.com>2021-05-19 15:49:11 -0700
committerZach White <skullydazed@gmail.com>2021-05-19 15:49:11 -0700
commit6955c5a00295382d3b4151a840aa5c929cd98059 (patch)
tree26109c4ed2a266650fc5fad19ce5f784bc7c346b /requirements.txt
parent82aa9ad4a567695d1f7d0b1e36bf8563d2967813 (diff)
parentdb1eacdaacb9c8f6889f46bc1c6af155b81ad72a (diff)
Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts: lib/python/qmk/tests/test_cli_commands.py util/install/fedora.sh
Diffstat (limited to 'requirements.txt')
0 files changed, 0 insertions, 0 deletions